Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 2 insertions, 4 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
index f9ab0fe..e6d1bf9 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
@@ -397,8 +397,6 @@ public class CompositeActivity extends Activity
     @Override

 	public String getType()

     {

-        if (getName().equals("domain"))

-            return "domain";

         return super.getType();

     }

 

@@ -415,12 +413,12 @@ public class CompositeActivity extends Activity
     }

 

     @Override

-	public void request(AgentPath agent, int itemSysKey, int transitionID, String requestData) throws AccessRightsException, InvalidTransitionException, InvalidDataException, ObjectNotFoundException, PersistencyException

+	public String request(AgentPath agent, int itemSysKey, int transitionID, String requestData) throws AccessRightsException, InvalidTransitionException, InvalidDataException, ObjectNotFoundException, PersistencyException

     {

         if (getChildrenGraphModel().getStartVertex() != null && !getStateMachine().getState(state).isFinished() && transitionID == CompositeActivity.START)

         	((WfVertex) getChildrenGraphModel().getStartVertex()).run(agent, itemSysKey);

 

-        super.request(agent, itemSysKey, transitionID, requestData);

+        return super.request(agent, itemSysKey, transitionID, requestData);

     }

     

 	public void refreshJobs(int itemSysKey)