3.0-SNAPSHOT (Will be first open source version)

New StateMachine desc
IssueID #28

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 c6442a0..b6ccd8c 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 );

 

@@ -261,7 +261,7 @@ public class TraceableEntity extends ItemPOA
 				}

                 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.");

                 try {

 					return Gateway.getMarshaller().marshall( jobBag );