activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1220906 - in /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker: Queue.scala Sink.scala
Date Mon, 19 Dec 2011 19:25:03 GMT
Author: chirino
Date: Mon Dec 19 19:25:02 2011
New Revision: 1220906

URL: http://svn.apache.org/viewvc?rev=1220906&view=rev
Log:
Fixes APLO-121 : The last messages sent to a queue could get stuck when the last producer
disconnects.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Sink.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=1220906&r1=1220905&r2=1220906&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
Mon Dec 19 19:25:02 2011
@@ -218,6 +218,9 @@ class Queue(val router: LocalRouter, val
   var swapping_out_size = 0
 
   val producer_swapped_in = new MemorySpace
+  // To allow overflow to drain into the queue even when there are no producers.
+  producer_swapped_in.size_max = 1024
+
   val consumer_swapped_in = new MemorySpace
 
   var swap_out_item_counter = 0L

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Sink.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Sink.scala?rev=1220906&r1=1220905&r2=1220906&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Sink.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Sink.scala
Mon Dec 19 19:25:02 2011
@@ -103,7 +103,7 @@ class OverflowSink[T](val downstream:Sin
 
   var refiller:Runnable = NOOP
 
-  private var overflow = collection.mutable.Queue[T]()
+  var overflow = collection.mutable.Queue[T]()
 
   def overflowed = !overflow.isEmpty
 



Mime
View raw message