[jbpm-commits] JBoss JBPM SVN: r6346 - in jbpm4/trunk/modules/pvm/src: test/java/org/jbpm/pvm/internal/tx and 1 other directory.

[do-not-reply at jboss.org]

Author: rebody
Date: 2010-05-15 09:38:22 -0400 (Sat, 15 May 2010)
New Revision: 6346

Added:
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/SpringToStandardSynchronizationTest.java
Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringToStandardSynchronization.java
Log:
correct spring transaction convert to synchronization

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringToStandardSynchronization.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringToStandardSynchronization.java	2010-05-15 11:35:46 UTC (rev 6345)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/SpringToStandardSynchronization.java	2010-05-15 13:38:22 UTC (rev 6346)
@@ -21,6 +21,7 @@
  */
 package org.jbpm.pvm.internal.tx;
 
+import javax.transaction.Status;
 import javax.transaction.Synchronization;
 
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -38,7 +39,14 @@
   }
 
   public void afterCompletion(int status) {
-    synchronization.afterCompletion(status);
+    if (status == STATUS_COMMITTED) {
+      synchronization.afterCompletion(Status.STATUS_COMMITTED);
+    } else if (status == STATUS_ROLLED_BACK) {
+      synchronization.afterCompletion(Status.STATUS_ROLLEDBACK);
+    } else {
+      throw new TransactionException("invalid transaction state: "
+        + status);
+    }
   }
 
   public void beforeCompletion() {

Added: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/SpringToStandardSynchronizationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/SpringToStandardSynchronizationTest.java	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/SpringToStandardSynchronizationTest.java	2010-05-15 13:38:22 UTC (rev 6346)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.tx;
+
+import junit.framework.TestCase;
+import javax.transaction.Status;
+import javax.transaction.Synchronization;
+import org.springframework.transaction.support.TransactionSynchronization;
+
+public class SpringToStandardSynchronizationTest extends TestCase {
+    public void testCommited() {
+        MockSync sync = new MockSync();
+        SpringToStandardSynchronization stss = new SpringToStandardSynchronization(sync);
+        stss.afterCompletion(TransactionSynchronization.STATUS_COMMITTED);
+        assertEquals(Status.STATUS_COMMITTED, sync.getStatus());
+    }
+
+    public void testRollback() {
+        MockSync sync = new MockSync();
+        SpringToStandardSynchronization stss = new SpringToStandardSynchronization(sync);
+        stss.afterCompletion(TransactionSynchronization.STATUS_ROLLED_BACK);
+        assertEquals(Status.STATUS_ROLLEDBACK, sync.getStatus());
+    }
+
+    public void testUnknowStatus() {
+        Synchronization sync = new MockSync();
+        SpringToStandardSynchronization stss = new SpringToStandardSynchronization(sync);
+        try {
+           stss.afterCompletion(TransactionSynchronization.STATUS_UNKNOWN);
+           fail();
+        } catch(TransactionException ex) {
+            assertTrue(true);
+        }
+    }
+
+    static class MockSync implements Synchronization {
+        private int status;
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void afterCompletion(int status) {
+            this.status = status;
+        }
+
+        public void beforeCompletion() {
+        }
+    }
+}