From ca801065730a89a040462247e972fa658adddcd5 Mon Sep 17 00:00:00 2001 From: Gary Tully Date: Fri, 6 Feb 2009 17:28:13 +0000 Subject: [PATCH] resolve unit test break, check for tx need to be overridden to take care of shared case git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@741646 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/activemq/ra/ManagedTransactionContext.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java index 9a21208c52..13fca74556 100755 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedTransactionContext.java @@ -121,6 +121,11 @@ public class ManagedTransactionContext extends TransactionContext { } } + @Override + public boolean isInTransaction() { + return isInXATransaction() || isInLocalTransaction(); + } + public boolean isSameRM(XAResource xaResource) throws XAException { if (useSharedTxContext) { return sharedContext.isSameRM(xaResource);