From 1e47d1ba034d7910a62346e1858a0e6339a2fbb4 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Thu, 15 Jun 2006 03:07:12 +0000 Subject: [PATCH] Applied http://issues.apache.org/activemq/browse/AMQ-608 thanks Kevin. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/branches/activemq-4.0@414444 13f79535-47bb-0310-9956-ffa450edef68 --- .../DemandForwardingBridgeSupport.java | 28 +++++++++---------- .../transport/failover/FailoverTransport.java | 4 +-- assembly/project.xml | 2 +- assembly/src/release/conf/activemq.xml | 27 ++++++++++-------- assembly/src/release/conf/log4j.properties | 2 +- 5 files changed, 33 insertions(+), 30 deletions(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java index c12cf1dcce..6c712af3d0 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java @@ -357,20 +357,20 @@ public abstract class DemandForwardingBridgeSupport implements Bridge { ConsumerInfo info=(ConsumerInfo) data; BrokerId[] path=info.getBrokerPath(); if((path!=null&&path.length>= networkTTL)){ - if(log.isTraceEnabled()) - log.trace("Ignoring Subscription " + info + " restricted to " + networkTTL + " network hops only"); + if(log.isDebugEnabled()) + log.debug("Ignoring Subscription " + info + " restricted to " + networkTTL + " network hops only"); return; } if(contains(info.getBrokerPath(),localBrokerPath[0])){ // Ignore this consumer as it's a consumer we locally sent to the broker. - if(log.isTraceEnabled()) - log.trace("Ignoring sub " + info + " already routed through this broker once"); + if(log.isDebugEnabled()) + log.debug("Ignoring sub " + info + " already routed through this broker once"); return; } if (!isPermissableDestination(info.getDestination())){ //ignore if not in the permited or in the excluded list - if(log.isTraceEnabled()) - log.trace("Ignoring sub " + info + " destination " + info.getDestination() + " is not permiited"); + if(log.isDebugEnabled()) + log.debug("Ignoring sub " + info + " destination " + info.getDestination() + " is not permiited"); return; } // Update the packet to show where it came from. @@ -379,11 +379,11 @@ public abstract class DemandForwardingBridgeSupport implements Bridge { DemandSubscription sub=createDemandSubscription(info); if (sub != null){ addSubscription(sub); - if(log.isTraceEnabled()) - log.trace("Forwarding sub on "+localBroker+" from "+remoteBrokerName+" : "+info); + if(log.isDebugEnabled()) + log.debug("Forwarding sub on "+localBroker+" from "+remoteBrokerName+" : "+info); }else { - if(log.isTraceEnabled()) - log.trace("Ignoring sub " + info + " already subscribed to matching destination"); + if(log.isDebugEnabled()) + log.debug("Ignoring sub " + info + " already subscribed to matching destination"); } } else if (data.getClass()==DestinationInfo.class){ @@ -392,14 +392,14 @@ public abstract class DemandForwardingBridgeSupport implements Bridge { DestinationInfo destInfo = (DestinationInfo) data; BrokerId[] path=destInfo.getBrokerPath(); if((path!=null&&path.length>= networkTTL)){ - if(log.isTraceEnabled()) - log.trace("Ignoring Subscription " + destInfo + " restricted to " + networkTTL + " network hops only"); + if(log.isDebugEnabled()) + log.debug("Ignoring Subscription " + destInfo + " restricted to " + networkTTL + " network hops only"); return; } if(contains(destInfo.getBrokerPath(),localBrokerPath[0])){ // Ignore this consumer as it's a consumer we locally sent to the broker. - if(log.isTraceEnabled()) - log.trace("Ignoring sub " + destInfo + " already routed through this broker once"); + if(log.isDebugEnabled()) + log.debug("Ignoring sub " + destInfo + " already routed through this broker once"); return; } diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java index b13c7be863..bc282f44c6 100755 --- a/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java @@ -194,8 +194,8 @@ public class FailoverTransport implements CompositeTransport { } if(!disposed){ - - log.debug("Waiting "+reconnectDelay+" ms before attempting connection. "); + if( log.isTraceEnabled() ) + log.trace("Waiting "+reconnectDelay+" ms before attempting connection. "); synchronized(sleepMutex){ try{ sleepMutex.wait(reconnectDelay); diff --git a/assembly/project.xml b/assembly/project.xml index ebaff0fa04..5acdabb7bf 100755 --- a/assembly/project.xml +++ b/assembly/project.xml @@ -86,7 +86,7 @@ + + + - - + + + + --> + + - + @@ -33,7 +36,7 @@ - +