activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1480599 - in /activemq/activemq-apollo/trunk: apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Sink.scala apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
Date Thu, 09 May 2013 12:22:59 GMT
Author: chirino
Date: Thu May  9 12:22:59 2013
New Revision: 1480599

URL: http://svn.apache.org/r1480599
Log:
Fix up some bugs in my last commit.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Sink.scala
    activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala

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=1480599&r1=1480598&r2=1480599&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
Thu May  9 12:22:59 2013
@@ -611,7 +611,6 @@ class Session[T](mux:SessionSinkMux[T], 
       ", enqueue_size_counter:"+enqueue_size_counter+
       ", delivery_credits:"+delivery_credits+
       ", size_credits:"+size_credits+
-      ", size_credits:"+size_credits+
       ", overflow:"+overflow.size()+
       ", stall_counter:"+stall_counter+
       ", size_bonus:"+size_bonus +

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala?rev=1480599&r1=1480598&r2=1480599&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/BrokerResource.scala
Thu May  9 12:22:59 2013
@@ -981,7 +981,9 @@ class BrokerResource() extends Resource 
   def connection(@PathParam("id") id : Long, @QueryParam("debug") debug:Boolean):ConnectionStatusDTO
= {
     with_connection(id){ connection=>
       monitoring(connection.connector.broker) {
-        connection.get_connection_status(debug)
+        sync(connection) {
+          connection.get_connection_status(debug)
+        }
       }
     }
   }



Mime
View raw message