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 2011/04/28 03:14:56 UTC

svn commit: r1097304 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala

Author: chirino
Date: Thu Apr 28 01:14:55 2011
New Revision: 1097304

URL: http://svn.apache.org/viewvc?rev=1097304&view=rev
Log:
Protect against NPE.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala?rev=1097304&r1=1097303&r2=1097304&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Thu Apr 28 01:14:55 2011
@@ -1372,7 +1372,11 @@ class Subscription(val queue:Queue, val 
     assert(pos!=null)
 
     session = consumer.connect(this)
-    session.refiller = dispatch_queue.runnable { pos.run }
+    session.refiller = dispatch_queue.runnable {
+      if( pos!=null ) {
+        pos.run
+      }
+    }
     queue.head_entry ::= this
 
     queue.all_subscriptions += consumer -> this