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 2010/12/07 14:35:31 UTC
svn commit: r1043042 -
/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
Author: chirino
Date: Tue Dec 7 13:35:30 2010
New Revision: 1043042
URL: http://svn.apache.org/viewvc?rev=1043042&view=rev
Log:
Fix 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=1043042&r1=1043041&r2=1043042&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 Tue Dec 7 13:35:30 2010
@@ -337,6 +337,7 @@ class Queue(val host: VirtualHost, var i
// swap out messages.
cur = entries.getHead
while( cur!=null ) {
+ val next = cur.getNext
val loaded = cur.as_loaded
if( loaded!=null ) {
if( cur.prefetch_flags==0 && !loaded.acquired ) {
@@ -346,7 +347,7 @@ class Queue(val host: VirtualHost, var i
cur.load // just in case it's getting flushed.
}
}
- cur = cur.getNext
+ cur = next
}