Author: chirino
Date: Thu Nov 18 12:26:41 2010
New Revision: 1036434

URL: http://svn.apache.org/viewvc?rev=1036434&view=rev
Log:
Trying to fix a NPE

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.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=1036434&r1=1036433&r2=1036434&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 Nov 18 12:26:41 2010
@@ -1393,7 +1393,7 @@ class Subscription(queue:Queue) extends 
       cur.nack // this unlinks the entry.
     }
 
-    session.refiller = null
+    session.refiller = NOOP
     session.close
     session = null
   }

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala?rev=1036434&r1=1036433&r2=1036434&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala Thu Nov 18 12:26:41 2010
@@ -359,7 +359,7 @@ class StompProtocolHandler extends Proto
       x
     }, dispatchQueue, StompFrame)
     connection_sink = new OverflowSink(session_manager.open(dispatchQueue));
-    connection_sink.refiller = ^{}
+    connection_sink.refiller = NOOP
     resumeRead
   }