activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-4731
Date Fri, 20 Sep 2013 22:03:42 GMT
Updated Branches:
  refs/heads/trunk 214204595 -> 8f7dbccf4


https://issues.apache.org/jira/browse/AMQ-4731

Initial fix for this issue.  Uses a separate collection to track the
creation time of the consumers, might want to test just using a
ConcurrentLinkedQueue since that will stay in creation or naturally
although the remove operations could cost more...removed debug logs. 

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

Branch: refs/heads/trunk
Commit: 8f7dbccf4cd19596c88c691e71c2dfd7c2ff4ebb
Parents: 2142045
Author: Timothy Bish <tabish121@gmai.com>
Authored: Fri Sep 20 16:50:20 2013 -0400
Committer: Timothy Bish <tabish121@gmai.com>
Committed: Fri Sep 20 18:03:18 2013 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/activemq/advisory/AdvisoryBroker.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/8f7dbccf/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
index e12c0ce..11af872 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
@@ -162,7 +162,6 @@ public class AdvisoryBroker extends BrokerFilter {
             ConsumerIdKey key = new ConsumerIdKey(info.getConsumerId());
             consumerTracker.put(key.getConsumerId(), key.getCreationTime());
             consumers.put(key, info);
-            LOG.info("Added {} to the map:", key);
             fireConsumerAdvisory(context, info.getDestination(), topic, info);
         } else {
             // We need to replay all the previously collected state objects
@@ -325,16 +324,15 @@ public class AdvisoryBroker extends BrokerFilter {
         ActiveMQDestination dest = info.getDestination();
         if (!AdvisorySupport.isAdvisoryTopic(dest)) {
             ActiveMQTopic topic = AdvisorySupport.getConsumerAdvisoryTopic(dest);
-
             Object value = consumerTracker.remove(info.getConsumerId());
             if (value != null) {
                 Long creationTime = (Long) value;
                 ConsumerIdKey key = new ConsumerIdKey(info.getConsumerId(), creationTime);
                 if (consumers.remove(key) == null) {
-                    LOG.info("Failed to remove:{} from the consumers map: {}", key, consumers);
+                    LOG.trace("Failed to remove:{} from the consumers map: {}", key, consumers);
                 }
             } else {
-                LOG.info("Failed to find consumer:{} in creation time tracking map: ", info.getConsumerId());
+                LOG.trace("Failed to find consumer:{} in creation time tracking map: ", info.getConsumerId());
             }
 
             if (!dest.isTemporary() || destinations.containsKey(dest)) {


Mime
View raw message