[jbpm-commits] JBoss JBPM SVN: r5908 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/model and 2 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-12-03 06:28:58 -0500 (Thu, 03 Dec 2009)
New Revision: 5908

Modified:
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessTest.java
   jbpm4/trunk/modules/test-db/src/test/resources/logging.properties
Log:
JBPM-2491 Deleting a ProcessInstance having a running Sub-ProcessInstance fails

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java	2009-12-03 09:20:11 UTC (rev 5907)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SubProcessActivity.java	2009-12-03 11:28:58 UTC (rev 5908)
@@ -86,11 +86,6 @@
     
     subProcessInstance.start();
 
-    DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class, false);
-    if (dbSession!=null) {
-      dbSession.save(subProcessInstance);
-    }
-    
     execution.waitForSignal();
   }
 

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-12-03 09:20:11 UTC (rev 5907)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-12-03 11:28:58 UTC (rev 5908)
@@ -34,9 +34,11 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import org.hibernate.Session;
 import org.jbpm.api.Execution;
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.activity.ActivityExecution;
+import org.jbpm.api.cmd.Environment;
 import org.jbpm.api.job.Job;
 import org.jbpm.api.job.Timer;
 import org.jbpm.api.listener.EventListenerExecution;
@@ -375,9 +377,8 @@
       if (superProcessExecution!=null) {
         log.trace(toString()+" signals super process execution");
         superProcessExecution.signal();
-      }
-      
-      if (dbSession!=null) {
+
+      } else if (dbSession!=null) {
         dbSession.deleteProcessInstance(id, false);
       }
     }

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessTest.java	2009-12-03 09:20:11 UTC (rev 5907)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/subprocess/SubProcessTest.java	2009-12-03 11:28:58 UTC (rev 5908)
@@ -112,8 +112,7 @@
     deployJpdlXmlString(SUB_PROCESS_NO_WAIT_STATE);
     deployJpdlXmlString(MAIN_PROCESS_NO_WAIT_STATE);
     
-    // uncomment to make the test fail
-    //executionService.startProcessInstanceByKey("mainProcess");
+    executionService.startProcessInstanceByKey("mainProcess");
   }
   
 }

Modified: jbpm4/trunk/modules/test-db/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/logging.properties	2009-12-03 09:20:11 UTC (rev 5907)
+++ jbpm4/trunk/modules/test-db/src/test/resources/logging.properties	2009-12-03 11:28:58 UTC (rev 5908)
@@ -12,7 +12,7 @@
 org.hibernate.level=INFO
 org.hibernate.cfg.SettingsFactory.level=SEVERE
 org.hibernate.cfg.HbmBinder.level=SEVERE
-# org.hibernate.SQL.level=FINEST
-# org.hibernate.type.level=FINEST
+org.hibernate.SQL.level=FINEST
+org.hibernate.type.level=FINEST
 # org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
 # org.hibernate.transaction.level=FINEST
\ No newline at end of file