svn commit: r658724 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java

[ch...@apache.org]

Author: chirino
Date: Wed May 21 08:23:09 2008
New Revision: 658724

URL: http://svn.apache.org/viewvc?rev=658724&view=rev
Log:
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).


Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java?rev=658724&r1=658723&r2=658724&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java Wed May 21 08:23:09 2008
@@ -153,6 +153,8 @@
             throw e;
         } catch (Throwable e) {
             throw JMSExceptionSupport.create(e);
+        } finally {
+        	synchornizations = null;
         }
     }
 
@@ -170,6 +172,8 @@
             throw e;
         } catch (Throwable e) {
             throw JMSExceptionSupport.create(e);
+        } finally {
+        	synchornizations = null;
         }
     }