Author: chirino
Date: Wed Jun 14 20:04:15 2006
New Revision: 414443
URL: http://svn.apache.org/viewvc?rev=414443&view=rev
Log:
Applied http://issues.apache.org/activemq/browse/AMQ-608 thanks Kevin.
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=414443&r1=414442&r2=414443&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
Wed Jun 14 20:04:15 2006
@@ -357,20 +357,20 @@
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 @@
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 @@
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;
}
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java?rev=414443&r1=414442&r2=414443&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
Wed Jun 14 20:04:15 2006
@@ -194,8 +194,8 @@
}
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);
