[jbpm-commits] JBoss JBPM SVN: r5614 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: test/java/org/jbpm/jbpm983 and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-09-04 22:42:08 -0400 (Fri, 04 Sep 2009)
New Revision: 5614

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Join.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm1755/parallelprocess.xml
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml
Log:
[SOA-1476] acquire non-versioned lock on parent token

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Join.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Join.java	2009-09-04 23:55:37 UTC (rev 5613)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Join.java	2009-09-05 02:42:08 UTC (rev 5614)
@@ -113,12 +113,12 @@
         JbpmContext jbpmContext = executionContext.getJbpmContext();
         Session session;
         if (jbpmContext != null && (session = jbpmContext.getSession()) != null) {
-          // obtain update lock by default (LockMode.UPGRADE)
+          // lock for update by default (LockMode.UPGRADE)
           LockMode lockMode = parentLockMode != null ? LockMode.parse(parentLockMode)
               : LockMode.UPGRADE;
-          log.debug("acquiring " + lockMode + " lock on " + parentToken);
-          // lock updates as appropriate, no need to flush here
-          session.lock(parentToken, lockMode);
+          // load() hits the database as required, no need to flush() here
+          parentToken = (Token) session.load(Token.class, new Long(parentToken.getId()), lockMode);
+          log.debug("acquired " + lockMode + " lock on " + parentToken);
         }
 
         boolean reactivateParent;

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java	2009-09-04 23:55:37 UTC (rev 5613)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java	2009-09-05 02:42:08 UTC (rev 5614)
@@ -60,12 +60,12 @@
       + "   <description>start of the process</description>"
       + "   <transition name='start-to-check' to='fileCheck'/>"
       + "</start-state>"
-      + "<node name='fileCheck' async='exclusive'>"
+      + "<node name='fileCheck' async='true'>"
       + "   <action name='action_filecheck' class='" + TestAction.class.getName() + "'>"
       + "   </action>"
       + "   <transition name='check-to-do' to='doWhatever'/>"
       + "</node>" 
-      + "<node name='doWhatever' async='exclusive'>"
+      + "<node name='doWhatever' async='true'>"
       + "   <action name='action_do' class='" + TestAction.class.getName() + "'/>"
       + "   <transition name='check-to-end' to='end-state-success'/>"
       + "</node>"
@@ -88,11 +88,11 @@
       + "   <transition name='toNode1' to='node1'/>"
       + "   <transition name='toNode2' to='node2'/>"
       + "</fork>"
-      + "<process-state name='node1' async='exclusive'>"
+      + "<process-state name='node1' async='true'>"
       + "   <sub-process name='subprocess'/>"
       + "   <transition name='node1toJoin1' to='join1'/>"
       + "</process-state>"
-      + "<process-state name='node2' async='exclusive'>"
+      + "<process-state name='node2' async='true'>"
       + "   <sub-process name='subprocess'/>"
       + "   <transition name='node2toJoin1' to='join1'/>"
       + "</process-state>"

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm1755/parallelprocess.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm1755/parallelprocess.xml	2009-09-04 23:55:37 UTC (rev 5613)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm1755/parallelprocess.xml	2009-09-05 02:42:08 UTC (rev 5614)
@@ -11,7 +11,7 @@
     <transition to="node1" name="1"></transition>
   </fork>
 
-  <join name="join1" async="exclusive">
+  <join name="join1">
     <transition to="end"></transition>
   </join>
 

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml	2009-09-04 23:55:37 UTC (rev 5613)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/resources/org/jbpm/jbpm2489/processdefinition.xml	2009-09-05 02:42:08 UTC (rev 5614)
@@ -74,7 +74,7 @@
     <transition to="join1"/>
   </node>
 
-  <join name="join1" async="exclusive">
+  <join name="join1">
     <transition to="Shipment Notice"/>
   </join>