Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied http://issues.apache.org/activemq/browse/AMQ-608 thanks Kevin. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@414443 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-06-15 03:04:15 +00:00
parent 5f318d3aef
commit c2a51115cd
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -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;
}

4
activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
View File

@ -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);