summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/entity/TraceableEntity.java
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-07-23 09:41:43 +0200
committerAndrew Branson <andrew.branson@cern.ch>2013-09-16 12:44:14 +0200
commite99ed30f6cae36c5f3fa03007d991e67894a01bb (patch)
tree5fdfe6aab9e31ebd8c282eb16d42c5e2f75b1217 /src/main/java/com/c2kernel/entity/TraceableEntity.java
parent0bb38e90ac6e88cb406facbc075983384a2e164f (diff)
More
Diffstat (limited to 'src/main/java/com/c2kernel/entity/TraceableEntity.java')
-rw-r--r--src/main/java/com/c2kernel/entity/TraceableEntity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/c2kernel/entity/TraceableEntity.java b/src/main/java/com/c2kernel/entity/TraceableEntity.java
index 83c30a2..4152ab5 100644
--- a/src/main/java/com/c2kernel/entity/TraceableEntity.java
+++ b/src/main/java/com/c2kernel/entity/TraceableEntity.java
@@ -21,7 +21,6 @@ import com.c2kernel.common.PersistencyException;
import com.c2kernel.entity.agent.JobArrayList;
import com.c2kernel.lifecycle.instance.CompositeActivity;
import com.c2kernel.lifecycle.instance.Workflow;
-import com.c2kernel.lifecycle.instance.stateMachine.Transitions;
import com.c2kernel.lookup.AgentPath;
import com.c2kernel.lookup.InvalidEntityPathException;
import com.c2kernel.persistency.ClusterStorage;
@@ -183,13 +182,14 @@ public class TraceableEntity extends ItemPOA
try {
Logger.msg(1, "TraceableEntity::request("+mSystemKey+") - " +
- Transitions.getTransitionName(transitionID) + " "+stepPath + " by " +agentId );
+ transitionID + " "+stepPath + " by " +agentId );
AgentPath agent = new AgentPath(agentId);
Workflow lifeCycle = (Workflow)mStorage.get(mSystemKey, ClusterStorage.LIFECYCLE+"/workflow", null);
lifeCycle.requestAction( agent,
stepPath,
+ mSystemKey,
transitionID,
requestData );
@@ -251,7 +251,7 @@ public class TraceableEntity extends ItemPOA
Workflow wf = (Workflow)mStorage.get(mSystemKey, ClusterStorage.LIFECYCLE+"/workflow", null);
JobArrayList jobBag = new JobArrayList();
CompositeActivity domainWf = (CompositeActivity)wf.search("workflow/domain");
- jobBag.list = filter?domainWf.calculateJobs(agent, true):domainWf.calculateAllJobs(agent, true);
+ jobBag.list = filter?domainWf.calculateJobs(agent, mSystemKey, true):domainWf.calculateAllJobs(agent, mSystemKey, true);
Logger.msg(1, "TraceableEntity::queryLifeCycle("+mSystemKey+") - Returning "+jobBag.list.size()+" jobs.");
return Gateway.getMarshaller().marshall( jobBag );
}