You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by gt...@apache.org on 2009/02/06 18:28:13 UTC

svn commit: r741646 - /activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java

Author: gtully
Date: Fri Feb  6 17:28:13 2009
New Revision: 741646

URL: http://svn.apache.org/viewvc?rev=741646&view=rev
Log:
resolve unit test break, check for tx need to be overridden to take care of shared case

Modified:
    activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java

Modified: activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java?rev=741646&r1=741645&r2=741646&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java (original)
+++ activemq/trunk/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java Fri Feb  6 17:28:13 2009
@@ -121,6 +121,11 @@
         }
     }
 
+    @Override
+    public boolean isInTransaction() {
+        return isInXATransaction() || isInLocalTransaction();
+    }
+ 
     public boolean isSameRM(XAResource xaResource) throws XAException {
         if (useSharedTxContext) {
             return sharedContext.isSameRM(xaResource);