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

[ch...@apache.org]

Author: chirino
Date: Tue Sep 28 19:40:16 2010
New Revision: 1002336

URL: http://svn.apache.org/viewvc?rev=1002336&view=rev
Log:
Fixes assert error: "java.lang.AssertionError: assertion failed: entry should not be prefetched." when using  a recovered queue.

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=1002336&r1=1002335&r2=1002336&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 Sep 28 19:40:16 2010
@@ -71,7 +71,7 @@ class Queue(val host: VirtualHost, var i
 
   val entries = new LinkedNodeList[QueueEntry]()
   val head_entry = new QueueEntry(this, 0L).head
-  var tail_entry = new QueueEntry(this, next_message_seq).tail
+  var tail_entry = new QueueEntry(this, next_message_seq)
   entries.addFirst(head_entry)
 
   //
@@ -185,6 +185,7 @@ class Queue(val host: VirtualHost, var i
                 message_seq_counter = range.lastQueueSeq + 1
                 enqueue_item_counter += range.count
                 enqueue_size_counter += range.size
+                tail_entry = new QueueEntry(Queue.this, next_message_seq)
               }
 
               debug("restored: "+enqueue_item_counter)