[01/14] activemq git commit: [no jira] make networkConsumerIds visible in toString of consumerinfo to aid tracing consumers in a network via transport trace logging

2017-09-07 Thread tabish 
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 51b428f49 -> 938745141


[no jira] make networkConsumerIds visible in toString of consumerinfo to aid 
tracing consumers in a network via transport trace logging

(cherry picked from commit 499347542c91774f0bd4a4e2a1a3932e286a7934)


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

Branch: refs/heads/activemq-5.15.x
Commit: cb62fd8388902630469dfdfaa927c91d84366b60
Parents: 51b428f
Author: gtully 
Authored: Fri Jul 7 16:01:49 2017 +0100
Committer: Timothy Bish 
Committed: Thu Sep 7 12:08:15 2017 -0400

--
 .../main/java/org/apache/activemq/command/ConsumerInfo.java  | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/cb62fd83/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java 
b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
index 5ccafab..eec3c5c 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
@@ -17,6 +17,7 @@
 package org.apache.activemq.command;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -532,4 +533,11 @@ public class ConsumerInfo extends BaseCommand implements 
TransientInitializer {
 lastDeliveredSequenceId = RemoveInfo.LAST_DELIVERED_UNSET;
 }
 
+@Override
+public String toString() {
+HashMap overrideFields = new HashMap();
+overrideFields.put("networkConsumerIds", networkConsumerIds);
+return super.toString(overrideFields);
+}
+
 }

activemq git commit: [no jira] make networkConsumerIds visible in toString of consumerinfo to aid tracing consumers in a network via transport trace logging

2017-07-07 Thread gtully 
Repository: activemq
Updated Branches:
  refs/heads/master 1f4831439 -> 499347542


[no jira] make networkConsumerIds visible in toString of consumerinfo to aid 
tracing consumers in a network via transport trace logging


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

Branch: refs/heads/master
Commit: 499347542c91774f0bd4a4e2a1a3932e286a7934
Parents: 1f48314
Author: gtully 
Authored: Fri Jul 7 16:01:49 2017 +0100
Committer: gtully 
Committed: Fri Jul 7 16:01:49 2017 +0100

--
 .../main/java/org/apache/activemq/command/ConsumerInfo.java  | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/49934754/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java 
b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
index 5ccafab..eec3c5c 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/command/ConsumerInfo.java
@@ -17,6 +17,7 @@
 package org.apache.activemq.command;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -532,4 +533,11 @@ public class ConsumerInfo extends BaseCommand implements 
TransientInitializer {
 lastDeliveredSequenceId = RemoveInfo.LAST_DELIVERED_UNSET;
 }
 
+@Override
+public String toString() {
+HashMap overrideFields = new HashMap();
+overrideFields.put("networkConsumerIds", networkConsumerIds);
+return super.toString(overrideFields);
+}
+
 }