[jbpm-commits] JBoss JBPM SVN: r2622 - in jbpm3/trunk/modules/enterprise/jar: src/main/java/org/jbpm/ejb/impl and 1 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2008-10-27 01:28:03 -0400 (Mon, 27 Oct 2008)
New Revision: 2622

Modified:
   jbpm3/trunk/modules/enterprise/jar/pom.xml
   jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java
   jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
Log:
[JBPM-1708] added async attribute to join node in testScheduleFork which prevents sporadic failures due to the ejb timer service retrying a failed timeout only once (in this case, after a stale state exception)
removed test exclusion from pom, test now pass reliably under hsqldb and postgresql

Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/pom.xml	2008-10-26 07:28:32 UTC (rev 2621)
+++ jbpm3/trunk/modules/enterprise/jar/pom.xml	2008-10-27 05:28:03 UTC (rev 2622)
@@ -260,14 +260,6 @@
         <plugins>
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <!-- https://jira.jboss.org/jira/browse/JBPM-1708 -->
-                <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude>
-                <!-- https://jira.jboss.org/jira/browse/JBPM-1709 -->
-                <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
-              </excludes>
-            </configuration>
           </plugin>
         </plugins>
       </build>

Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java	2008-10-26 07:28:32 UTC (rev 2621)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java	2008-10-27 05:28:03 UTC (rev 2622)
@@ -61,8 +61,7 @@
     JobSession jobSession = jbpmContext.getJobSession();
     Job job = jobSession.getJob(jobId);
     if (job == null || job.getLockOwner() != null) {
-      log.debug("job " + jobId + " was deleted or is locked, abandoning execution");
-      jbpmContext.setRollbackOnly();
+      log.debug("job " + jobId + " was deleted or is locked, ignoring command");
       return null;
     }
     String lockOwner = Long.toString(jobId);

Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java	2008-10-26 07:28:32 UTC (rev 2621)
+++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java	2008-10-27 05:28:03 UTC (rev 2622)
@@ -28,7 +28,6 @@
 import javax.naming.InitialContext;
 
 import junit.framework.Test;
-import junit.framework.TestSuite;
 
 import org.apache.cactus.ServletTestCase;
 import org.apache.commons.logging.Log;
@@ -250,7 +249,7 @@
         + "    <timer duedate='1.25 second' transition='timeout' />"
         + "    <transition name='timeout' to='j' />"
         + "  </state>"
-        + "  <join name='j'>"
+        + "  <join name='j' async='exclusive'>"
         + "    <transition to='end' />"
         + "  </join>"
         + "  <end-state name='end' />"