From b135f8abad849297ed8103eb62921722227f55b2 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 21 May 2008 15:23:09 +0000 Subject: [PATCH] When jencks shuts down an endpoint, it rolls back the last action done on it.. Was causing weird errors to show up on the broker cause the message had already been commited. We now handle an RA commit followed by a rollback for this case (basicaly we ignore the rollback). git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@658724 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/activemq/TransactionContext.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java b/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java index 164c19ba86..001e11c70b 100755 --- a/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java +++ b/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java @@ -153,6 +153,8 @@ public class TransactionContext implements XAResource { throw e; } catch (Throwable e) { throw JMSExceptionSupport.create(e); + } finally { + synchornizations = null; } } @@ -170,6 +172,8 @@ public class TransactionContext implements XAResource { throw e; } catch (Throwable e) { throw JMSExceptionSupport.create(e); + } finally { + synchornizations = null; } }