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/22 01:26:17 UTC

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

Author: chirino
Date: Sat Jul 21 23:26:16 2012
New Revision: 1364188

URL: http://svn.apache.org/viewvc?rev=1364188&view=rev
Log:
Fixes a NPE case the would occur on rollback that was introduced /w the fix to APLO-218.

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=1364188&r1=1364187&r2=1364188&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 Sat Jul 21 23:26:16 2012
@@ -1540,7 +1540,11 @@ class StompProtocolHandler extends Proto
     }
 
     def rollback = {
-      queue.foreach{ _._2() }
+      queue.foreach{ case (x, y) =>
+        if( y != null ) {
+          y()
+        }
+      }
     }
 
   }