activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1372516 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
Date Mon, 13 Aug 2012 17:08:14 GMT
Author: chirino
Date: Mon Aug 13 17:08:14 2012
New Revision: 1372516

URL: http://svn.apache.org/viewvc?rev=1372516&view=rev
Log:
Fixes failing assertion due to previous commit

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala?rev=1372516&r1=1372515&r2=1372516&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/VirtualHost.scala
Mon Aug 13 17:08:14 2012
@@ -297,7 +297,7 @@ class VirtualHost(val broker: Broker, va
     }
   }
 
-  def get_topic_metrics:FutureResult[AggregateDestMetricsDTO] = {
+  def get_topic_metrics:FutureResult[AggregateDestMetricsDTO] = sync(this) {
     val topics:Iterable[Topic] = local_router.local_topic_domain.destinations
     val metrics: Future[Iterable[Result[DestMetricsDTO, Throwable]]] = Future.all {
       topics.map(_.status.map(_.map_success(_.metrics)))
@@ -311,7 +311,7 @@ class VirtualHost(val broker: Broker, va
   
   import FutureResult._
 
-  def get_queue_metrics:FutureResult[AggregateDestMetricsDTO] = {
+  def get_queue_metrics:FutureResult[AggregateDestMetricsDTO] = sync(this) {
     val queues:Iterable[Queue] = local_router.local_queue_domain.destinations
     val metrics = sync_all (queues) { queue =>
       queue.get_queue_metrics



Mime
View raw message