[jboss-cvs] JBossAS SVN: r58987 - branches/Branch_4_2/server/src/main/org/jboss/ejb

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

Author: dimitris at jboss.org
Date: 2006-12-12 04:53:18 -0500 (Tue, 12 Dec 2006)
New Revision: 58987

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/ejb/EnterpriseContext.java
Log:
JBAS-3847, consider an asynchronous rollback due to timeout

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/EnterpriseContext.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/EnterpriseContext.java	2006-12-12 09:41:30 UTC (rev 58986)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/EnterpriseContext.java	2006-12-12 09:53:18 UTC (rev 58987)
@@ -21,15 +21,17 @@
  */
 package org.jboss.ejb;
 
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.BeanMetaData;
-import org.jboss.metadata.SecurityRoleRefMetaData;
-import org.jboss.security.RealmMapping;
-import org.jboss.security.RunAsIdentity;
-import org.jboss.security.SimplePrincipal;
-import org.jboss.tm.TransactionTimeoutConfiguration;
-import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
+import java.rmi.RemoteException;
+import java.security.CodeSource;
+import java.security.Identity;
+import java.security.Policy;
+import java.security.Principal;
+import java.security.ProtectionDomain;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Stack;
 
 import javax.ejb.EJBContext;
 import javax.ejb.EJBException;
@@ -52,17 +54,15 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-import java.rmi.RemoteException;
-import java.security.CodeSource;
-import java.security.Identity;
-import java.security.Policy;
-import java.security.Principal;
-import java.security.ProtectionDomain;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.SecurityRoleRefMetaData;
+import org.jboss.security.RealmMapping;
+import org.jboss.security.RunAsIdentity;
+import org.jboss.security.SimplePrincipal;
+import org.jboss.tm.TransactionTimeoutConfiguration;
+import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
 
 //$Id$
 
@@ -303,8 +303,7 @@
 
    // Inner classes -------------------------------------------------
 
-   protected class EJBContextImpl
-   implements EJBContext
+   protected class EJBContextImpl implements EJBContext
    {
       private InitialContext ctx;
 
@@ -471,7 +470,11 @@
             if (tm.getTransaction() == null)
                throw new IllegalStateException("getRollbackOnly() not allowed without a transaction.");
 
-            return tm.getStatus() == Status.STATUS_MARKED_ROLLBACK;
+            // JBAS-3847, consider an asynchronous rollback due to timeout
+            int status = tm.getStatus();
+            return status == Status.STATUS_MARKED_ROLLBACK
+                || status == Status.STATUS_ROLLING_BACK
+                || status == Status.STATUS_ROLLEDBACK;
          }
          catch (SystemException e)
          {