activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1291378 - in /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker: LocalRouter.scala Queue.scala
Date Mon, 20 Feb 2012 17:14:28 GMT
Author: chirino
Date: Mon Feb 20 17:14:28 2012
New Revision: 1291378

URL: http://svn.apache.org/viewvc?rev=1291378&view=rev
Log:
The tail_buffer queue config setting was not being properly picked up on startup

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
    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/LocalRouter.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala?rev=1291378&r1=1291377&r2=1291378&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
Mon Feb 20 17:14:28 2012
@@ -1225,7 +1225,7 @@ class LocalRouter(val virtual_host:Virtu
 
     val config = binding.config(virtual_host)
 
-    val queue = new Queue(this, qid, binding, config)
+    val queue = new Queue(this, qid, binding).configure(config)
     if( queue.tune_persistent && id == -1) {
       val record = QueueRecord(queue.store_id, binding.binding_kind, binding.binding_data)
       virtual_host.store.add_queue(record) { rc => Unit }

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=1291378&r1=1291377&r2=1291378&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 Feb 20 17:14:28 2012
@@ -60,7 +60,7 @@ import Queue._
  *
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-class Queue(val router: LocalRouter, val store_id:Long, var binding:Binding, var config:QueueDTO)
extends BaseRetained with BindableDeliveryProducer with DeliveryConsumer with BaseService
with DomainDestination with Dispatched with SecuredResource {
+class Queue(val router: LocalRouter, val store_id:Long, var binding:Binding) extends BaseRetained
with BindableDeliveryProducer with DeliveryConsumer with BaseService with DomainDestination
with Dispatched with SecuredResource {
   override def toString = binding.toString
 
   def virtual_host = router.virtual_host
@@ -217,6 +217,8 @@ class Queue(val router: LocalRouter, val
   var loaded_size = 0
   def swapped_in_size_max = this.producer_swapped_in.size_max + this.consumer_swapped_in.size_max
 
+  var config:QueueDTO = _
+
   def configure(update:QueueDTO) = {
     def mem_size(value:String, default:Int) = Option(value).map(MemoryPropertyEditor.parse(_).toInt).getOrElse(default)
 
@@ -240,11 +242,9 @@ class Queue(val router: LocalRouter, val
         auto_delete_after = 0
       }
     }
-
     config = update
+    this
   }
-  configure(config)
-
 
   def get_queue_metrics:DestMetricsDTO = {
     dispatch_queue.assertExecuting()



Mime
View raw message