activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [09/13] git commit: Fix for https://issues.apache.org/jira/browse/AMQ-4912
Date Thu, 13 Mar 2014 15:49:09 GMT
Fix for https://issues.apache.org/jira/browse/AMQ-4912


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/015c6cce
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/015c6cce
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/015c6cce

Branch: refs/heads/activemq-5.9
Commit: 015c6cce7341d03cecfd3e1f1a52c86a9f3b78e9
Parents: 4a80e95
Author: rajdavies <rajdavies@gmail.com>
Authored: Mon Dec 9 16:59:26 2013 +0000
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Thu Mar 13 11:06:57 2014 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/activemq/plugin/StatisticsBroker.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/015c6cce/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
b/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
index 9679274..c1949c5 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
@@ -104,6 +104,8 @@ public class StatisticsBroker extends BrokerFilter {
                     DestinationStatistics stats = dest.getDestinationStatistics();
                     if (stats != null) {
                         ActiveMQMapMessage statsMessage = new ActiveMQMapMessage();
+                        statsMessage.setString("brokerName", regionBroker.getBrokerName());
+                        statsMessage.setString("brokerId", regionBroker.getBrokerId().toString());
                         statsMessage.setString("destinationName", dest.getActiveMQDestination().toString());
                         statsMessage.setLong("size", stats.getMessages().getCount());
                         statsMessage.setLong("enqueueCount", stats.getEnqueues().getCount());
@@ -223,7 +225,10 @@ public class StatisticsBroker extends BrokerFilter {
     }
 
     protected ActiveMQMapMessage prepareSubscriptionMessage(SubscriptionViewMBean subscriber)
throws JMSException {
+        Broker regionBroker = getBrokerService().getRegionBroker();
         ActiveMQMapMessage statsMessage = new ActiveMQMapMessage();
+        statsMessage.setString("brokerName", regionBroker.getBrokerName());
+        statsMessage.setString("brokerId", regionBroker.getBrokerId().toString());
         statsMessage.setString("destinationName", subscriber.getDestinationName());
         statsMessage.setString("clientId", subscriber.getClientId());
         statsMessage.setString("connectionId", subscriber.getConnectionId());


Mime
View raw message