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

Posted to commits@activemq.apache.org by ch...@apache.org on 2012/07/23 18:38:19 UTC

svn commit: r1364703 - /activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala

Author: chirino
Date: Mon Jul 23 16:38:19 2012
New Revision: 1364703

URL: http://svn.apache.org/viewvc?rev=1364703&view=rev
Log:
related to APLO-218, we now need to make sure we explicitly rollback any in-progress TXs when the connection is terminated so that consumers can be released.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1364703&r1=1364702&r2=1364703&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala Mon Jul 23 16:38:19 2012
@@ -772,6 +772,13 @@ class StompProtocolHandler extends Proto
       dead = true;
 
       import collection.JavaConversions._
+
+      // Rollback any in-progress transactions..
+      for( (id, tx) <- transactions ) {
+        tx.rollback
+      }
+      transactions.clear()
+
       producerRoutes.values().foreach{ route=>
         host.dispatch_queue {
           host.router.disconnect(route.addresses, route)