[jboss-cvs] JBossAS SVN: r110103 - in branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb: plugins and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 21 12:19:14 EST 2010
Author: bmaxwell
Date: 2010-12-21 12:19:13 -0500 (Tue, 21 Dec 2010)
New Revision: 110103
Modified:
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/EnterpriseContext.java
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/GlobalTxEntityMap.java
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/EntityReentranceInterceptor.java
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java
branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/lock/SimpleReadWriteEJBLock.java
Log:
[JBPAPP-5607] Problem with QueuedPessimisticEJBLock and Arjuna
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/EnterpriseContext.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/EnterpriseContext.java 2010-12-21 17:08:42 UTC (rev 110102)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/EnterpriseContext.java 2010-12-21 17:19:13 UTC (rev 110103)
@@ -62,6 +62,7 @@
import org.jboss.security.RunAsIdentity;
import org.jboss.security.SimplePrincipal;
import org.jboss.tm.TransactionTimeoutConfiguration;
+import org.jboss.tm.TxUtils;
import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
//$Id$
@@ -472,9 +473,7 @@
// 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;
+ return TxUtils.isRollback(status);
}
catch (SystemException e)
{
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/GlobalTxEntityMap.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/GlobalTxEntityMap.java 2010-12-21 17:08:42 UTC (rev 110102)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/GlobalTxEntityMap.java 2010-12-21 17:19:13 UTC (rev 110103)
@@ -23,6 +23,7 @@
import org.jboss.logging.Logger;
import org.jboss.tm.TransactionLocal;
+import org.jboss.tm.TxUtils;
import javax.ejb.EJBException;
import javax.transaction.RollbackException;
@@ -338,7 +339,7 @@
{
// any one can mark the tx rollback at any time so check
// before continuing to the next store
- if(tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+ if(TxUtils.isRollback(tx))
{
return;
}
@@ -351,7 +352,7 @@
{
// any one can mark the tx rollback at any time so check
// before continuing to the next store
- if(tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+ if(TxUtils.isRollback(tx))
{
return;
}
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/EntityReentranceInterceptor.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/EntityReentranceInterceptor.java 2010-12-21 17:08:42 UTC (rev 110102)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/EntityReentranceInterceptor.java 2010-12-21 17:19:13 UTC (rev 110103)
@@ -33,6 +33,7 @@
import org.jboss.ejb.Container;
import org.jboss.ejb.EntityEnterpriseContext;
import org.jboss.metadata.EntityMetaData;
+import org.jboss.tm.TxUtils;
import org.jboss.ejb.plugins.lock.Entrancy;
import org.jboss.ejb.plugins.lock.NonReentrantLock;
import org.jboss.ejb.plugins.cmp.jdbc.bridge.CMRInvocation;
@@ -69,11 +70,7 @@
protected boolean isTxExpired(Transaction miTx) throws Exception
{
- if (miTx != null && miTx.getStatus() == Status.STATUS_MARKED_ROLLBACK)
- {
- return true;
- }
- return false;
+ return TxUtils.isRollback(miTx);
}
public Object invoke(Invocation mi)
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java 2010-12-21 17:08:42 UTC (rev 110102)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java 2010-12-21 17:19:13 UTC (rev 110103)
@@ -47,6 +47,21 @@
import java.rmi.NoSuchObjectException;
import java.rmi.RemoteException;
+import org.jboss.ejb.AllowedOperationsAssociation;
+import org.jboss.ejb.BeanLock;
+import org.jboss.ejb.Container;
+import org.jboss.ejb.EnterpriseContext;
+import org.jboss.ejb.InstanceCache;
+import org.jboss.ejb.InstancePool;
+import org.jboss.ejb.StatefulSessionContainer;
+import org.jboss.invocation.Invocation;
+import org.jboss.invocation.InvocationType;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.SessionMetaData;
+import org.jboss.security.AuthenticationManager;
+import org.jboss.security.SecurityConstants;
+import org.jboss.tm.TxUtils;
+
/**
* This container acquires the given instance.
*
@@ -172,9 +187,8 @@
// OSH: An extra check to avoid warning.
// Can go when we are sure that we no longer get
// the JTA violation warning.
- if (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+ if (TxUtils.isRollback(tx.getStatus()))
{
-
return;
}
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java 2010-12-21 17:08:42 UTC (rev 110102)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/lock/QueuedPessimisticEJBLock.java 2010-12-21 17:19:13 UTC (rev 110103)
@@ -32,6 +32,7 @@
import org.jboss.ejb.Container;
import org.jboss.ejb.EntityEnterpriseContext;
import org.jboss.monitor.LockMonitor;
+import org.jboss.tm.TxUtils;
import org.jboss.util.deadlock.DeadlockDetector;
/**
@@ -177,12 +178,7 @@
protected boolean isTxExpired(Transaction miTx) throws Exception
{
- if(miTx == null)
- return false;
- int status = miTx.getStatus();
- return status == Status.STATUS_MARKED_ROLLBACK ||
- status == Status.STATUS_ROLLEDBACK ||
- status == Status.STATUS_ROLLING_BACK;
+ return TxUtils.isRollback(miTx);
}
Modified: branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/lock/SimpleReadWriteEJBLock.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/lock/SimpleReadWriteEJBLock.java 2010-12-21 17:08:42 UTC (rev 110102)
+++ branches/JBPAPP_4_2_0_GA_CP/server/src/main/org/jboss/ejb/plugins/lock/SimpleReadWriteEJBLock.java 2010-12-21 17:19:13 UTC (rev 110103)
@@ -30,11 +30,11 @@
import javax.ejb.EJBObject;
import javax.ejb.EJBException;
-import javax.transaction.Status;
import javax.transaction.Transaction;
import javax.transaction.Synchronization;
import org.jboss.invocation.Invocation;
+import org.jboss.tm.TxUtils;
/**
*
@@ -336,7 +336,7 @@
{
try
{
- if(tx != null && tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+ if(TxUtils.isRollback(tx))
throw new EJBException ("Transaction marked for rollback - probably a timeout.");
}
catch (Exception e)
More information about the jboss-cvs-commits
mailing list