[jbpm-commits] JBoss JBPM SVN: r3964 - jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-02-19 18:48:37 -0500 (Thu, 19 Feb 2009)
New Revision: 3964

Modified:
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
Log:
JBPM-1471: throw exception when signaling ended token;
do not signal ended super process instance

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java	2009-02-19 21:37:38 UTC (rev 3963)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java	2009-02-19 23:48:37 UTC (rev 3964)
@@ -354,7 +354,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/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe/Token.java	2009-02-19 21:37:38 UTC (rev 3963)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/graph/exe/Token.java	2009-02-19 23:48:37 UTC (rev 3964)
@@ -211,6 +211,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