|
|
|
@ -59,7 +59,6 @@ public class Executor {
|
|
|
|
|
public String getResultLink(@PathParam("jobKey") String jobKey) throws InvalidIdentifierException {
|
|
|
|
|
String node;
|
|
|
|
|
String jobId;
|
|
|
|
|
|
|
|
|
|
try{
|
|
|
|
|
node = extractNode(jobKey);
|
|
|
|
|
jobId = extractId(jobKey);
|
|
|
|
@ -216,22 +215,25 @@ public class Executor {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static String extractNode(String key) throws IdNotValidException{
|
|
|
|
|
String[] splitted = key.split("\\|\\|");
|
|
|
|
|
logger.trace("id arrived is {}", key );
|
|
|
|
|
String[] splitted = key.split("_");
|
|
|
|
|
if (splitted.length==2)
|
|
|
|
|
return splitted[0];
|
|
|
|
|
else throw new IdNotValidException();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static String extractId(String key) throws IdNotValidException{
|
|
|
|
|
String[] splitted = key.split("\\|\\|");
|
|
|
|
|
logger.trace("id arrived is {}", key );
|
|
|
|
|
String[] splitted = key.split("_");
|
|
|
|
|
if (splitted.length==2)
|
|
|
|
|
return splitted[1];
|
|
|
|
|
else throw new IdNotValidException();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private String createKey(String id){
|
|
|
|
|
logger.trace("id arrived is {}", id );
|
|
|
|
|
String node = cxt.container().profile(HostingNode.class).id();
|
|
|
|
|
return node+"||"+id;
|
|
|
|
|
return node+"_"+id;
|
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
private Executor remoteJobCall(String riId) throws InvalidIdentifierException{
|
|
|
|
|