[jbpm-commits] JBoss JBPM SVN: r6904 - in jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src: main/java/org/jbpm/graph/node and 3 other directories.

[do-not-reply at jboss.org]

Author: mputz
Date: 2011-03-29 05:54:34 -0400 (Tue, 29 Mar 2011)
New Revision: 6904

Added:
   jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml
Modified:
   jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
   jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/node/ProcessState.java
   jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
   jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
Log:
SOA-2990: Restore synchronous signaling behavior for sub-processes

Modified: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java	2011-03-29 09:07:36 UTC (rev 6903)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/exe/ProcessInstance.java	2011-03-29 09:54:34 UTC (rev 6904)
@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jbpm.JbpmConfiguration.Configs;
 import org.jbpm.JbpmContext;
 import org.jbpm.JbpmException;
 import org.jbpm.context.exe.ContextInstance;
@@ -328,7 +329,7 @@
     if (superProcessToken != null && !superProcessToken.hasEnded()) {
       // is message service available?
       MessageService messageService;
-      if (jbpmContext != null
+      if (jbpmContext != null && Configs.getBoolean("jbpm.sub.process.async")
         && (messageService = jbpmContext.getServices().getMessageService()) != null) {
         // signal super-process token asynchronously to avoid stale state exceptions
         // due to concurrent signals to the super-process

Modified: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/node/ProcessState.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/node/ProcessState.java	2011-03-29 09:07:36 UTC (rev 6903)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/java/org/jbpm/graph/node/ProcessState.java	2011-03-29 09:54:34 UTC (rev 6904)
@@ -193,7 +193,7 @@
     // send the signal to start the subprocess
     JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext();
     MessageService messageService;
-    if (jbpmContext != null
+    if (jbpmContext != null && Configs.getBoolean("jbpm.sub.process.async")
       && (messageService = jbpmContext.getServices().getMessageService()) != null) {
       // signal sub-process token asynchronously to clearly denote transactional boundaries
       // https://jira.jboss.org/browse/JBPM-2948

Modified: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml	2011-03-29 09:07:36 UTC (rev 6903)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/main/resources/org/jbpm/default.jbpm.cfg.xml	2011-03-29 09:54:34 UTC (rev 6904)
@@ -64,6 +64,9 @@
   <bean name="jbpm.sub.process.resolver" class="org.jbpm.graph.node.DbSubProcessResolver"
     singleton="true" />
 
+  <boolean name="jbpm.sub.process.async" value="false" />
+
+
   <bean name="jbpm.expression.evaluator" class="org.jbpm.jpdl.el.impl.ExpressionEvaluatorImpl"
     singleton="true" />
   <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver"

Modified: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java	2011-03-29 09:07:36 UTC (rev 6903)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/java/org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java	2011-03-29 09:54:34 UTC (rev 6904)
@@ -27,6 +27,10 @@
 import org.jbpm.graph.def.ProcessDefinition;
 
 public class SubProcessPlusConcurrencyDbTest extends AbstractDbTestCase {
+    
+  protected String getJbpmTestConfig() {
+    return "org/jbpm/graph/node/sub-process-async.cfg.xml";
+  }    
 
   protected void setUp() throws Exception {
     super.setUp();

Added: jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml
===================================================================
--- jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml	                        (rev 0)
+++ jbpm3/tags/jbpm-3.2.10_SOA-2990/core/src/test/resources/org/jbpm/graph/node/sub-process-async.cfg.xml	2011-03-29 09:54:34 UTC (rev 6904)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<jbpm-configuration>
+  <boolean name="jbpm.sub.process.async" value="true" />
+</jbpm-configuration>
\ No newline at end of file