summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2012-07-13 16:29:25 +0200
committerAndrew Branson <andrew.branson@cern.ch>2012-07-13 16:29:25 +0200
commit1c59e048e46139f7ed6d0ee924901aea3878e67d (patch)
tree5570cb76ff0317cde0a0ca22ebcbd9a1bafe0fce /src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
parent0b7ccbb852f40b4869918ff793c3db3a586bd3cc (diff)
New property 'Breakpoint' in Activity. If set to true, the workflow will
not proceed automatically past that activity after COMPLETE or DONE transitions, but will instead wait for PROCEED or SKIP. AUTOSTART removed. Now composite activities autostart, while atomic ones don't. closes #30
Diffstat (limited to 'src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java')
-rw-r--r--src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
index 45d04c0..f3f5a81 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
@@ -11,7 +11,6 @@ import com.c2kernel.entity.agent.Job;
import com.c2kernel.graph.model.GraphModel;
import com.c2kernel.graph.model.GraphPoint;
import com.c2kernel.graph.model.GraphableVertex;
-import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;
import com.c2kernel.lifecycle.instance.stateMachine.States;
import com.c2kernel.lifecycle.instance.stateMachine.Transitions;
import com.c2kernel.lookup.AgentPath;
@@ -283,7 +282,7 @@ public class CompositeActivity extends Activity
public void run(AgentPath agent) throws ScriptingEngineException
{
super.run(agent);
- if (getChildrenGraphModel().getStartVertex() != null && getMachine().getCurrentState() != States.FINISHED && ((Boolean) getProperties().get(StateMachine.AUTOSTART)).booleanValue())
+ if (getChildrenGraphModel().getStartVertex() != null && getMachine().getCurrentState() != States.FINISHED)
{
WfVertex first = (WfVertex) getChildrenGraphModel().getStartVertex();
first.run(agent);