[jboss-svn-commits] JBL Code SVN: r17859 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-01-15 06:58:48 -0500 (Tue, 15 Jan 2008)
New Revision: 17859

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java
Log:
Handle terminated tokens: JBESB-1482

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java	2008-01-15 11:55:10 UTC (rev 17858)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/CallbackCommand.java	2008-01-15 11:58:48 UTC (rev 17859)
@@ -91,6 +91,9 @@
                 if (nodeId != token.getNode().getId()) {
                     throw new CallbackException("Token id " + tokenId + " from process instance " + processInstanceId + " is no longer on expected node") ;
                 }
+                if (token.hasEnded()) {
+                    throw new CallbackException("Token id " + tokenId + " from process instance " + processInstanceId + " has already terminated") ;
+                }
                 discovered = true ;
                 break;
             }