[jbpm-commits] JBoss JBPM SVN: r3809 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe.

[do-not-reply at jboss.org]

Author: camunda
Date: 2009-02-09 07:38:03 -0500 (Mon, 09 Feb 2009)
New Revision: 3809

Modified:
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
Log:
JBPM-2033 / JBPM-1471: ended token cannot be signaled any more. Ending sub process doesn't signal ended super process any more as well..

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java	2009-02-09 11:23:23 UTC (rev 3808)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java	2009-02-09 12:38:03 UTC (rev 3809)
@@ -350,7 +350,7 @@
       rootToken.addLog(new ProcessInstanceEndLog());
 
       // check if this process was started as a subprocess of a super process
-      if (superProcessToken != null)
+      if (superProcessToken != null && !superProcessToken.hasEnded())
       {
         addCascadeProcessInstance(superProcessToken.getProcessInstance());
 

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java	2009-02-09 11:23:23 UTC (rev 3808)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/exe/Token.java	2009-02-09 12:38:03 UTC (rev 3809)
@@ -210,6 +210,10 @@
     {
       throw new JbpmException("this token is locked by " + lock);
     }
+    if (hasEnded())
+    {
+      throw new JbpmException("Token '" + name + "' (" + id + ") is already ended and cannot be signaled");
+    }
 
     startCompositeLog(new SignalLog(transition));
     try