[jboss-cvs] JBossAS SVN: r109991 - trunk/server/src/main/java/org/jboss/ejb/plugins/lock.

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

Author: alex.loubyansky at jboss.com
Date: 2010-12-17 10:59:07 -0500 (Fri, 17 Dec 2010)
New Revision: 109991

Modified:
   trunk/server/src/main/java/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java
Log:
JBAS-6348

Modified: trunk/server/src/main/java/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java	2010-12-17 15:04:06 UTC (rev 109990)
+++ trunk/server/src/main/java/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java	2010-12-17 15:59:07 UTC (rev 109991)
@@ -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;
    }