[jboss-cvs] JBossAS SVN: r110023 - branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/lock.

[jboss-cvs-commits at lists.jboss.org]

Author: bmaxwell
Date: 2010-12-17 20:48:20 -0500 (Fri, 17 Dec 2010)
New Revision: 110023

Modified:
   branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java
Log:
[JBPAPP-5608] Problem with QueuedPessimisticEJBLock and Arjuna

Modified: branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java
===================================================================
--- branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java	2010-12-18 01:44:15 UTC (rev 110022)
+++ branches/JBPAPP_5_1/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java	2010-12-18 01:48:20 UTC (rev 110023)
@@ -177,11 +177,12 @@
 
    protected boolean isTxExpired(Transaction miTx) throws Exception
    {
-      if (miTx != null && miTx.getStatus() == Status.STATUS_MARKED_ROLLBACK)
-      {
-         return true;
-      }
-      return false;
+      if(miTx == null)
+         return false;
+      int status = miTx.getStatus();
+      return status == Status.STATUS_MARKED_ROLLBACK ||
+         status == Status.STATUS_ROLLEDBACK ||
+         status == Status.STATUS_ROLLING_BACK;
    }