Author: chirino
Date: Tue Dec 14 16:46:00 2010
New Revision: 1049155
URL: http://svn.apache.org/viewvc?rev=1049155&view=rev
Log:
Fixes an NPE on recovery.
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=1049155&r1=1049154&r2=1049155&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 14 16:46:00 2010
@@ -190,7 +190,7 @@ class Queue(val host: VirtualHost, var i
host.store.listQueueEntryRanges(id, tune_flush_range_size) { ranges=>
dispatchQueue {
- if( !ranges.isEmpty ) {
+ if( ranges!=null && !ranges.isEmpty ) {
ranges.foreach { range =>
val entry = new QueueEntry(Queue.this,
range.firstQueueSeq).init(range)
