You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/08/16 17:07:06 UTC

svn commit: r1373872 - /activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/NetworkBridgeFilter.java

Author: chirino
Date: Thu Aug 16 15:07:06 2012
New Revision: 1373872

URL: http://svn.apache.org/viewvc?rev=1373872&view=rev
Log:
Remove use of clogging.

Modified:
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/NetworkBridgeFilter.java

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/NetworkBridgeFilter.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/NetworkBridgeFilter.java?rev=1373872&r1=1373871&r2=1373872&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/NetworkBridgeFilter.java (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/command/NetworkBridgeFilter.java Thu Aug 16 15:07:06 2012
@@ -21,8 +21,6 @@ import java.util.Arrays;
 import org.apache.activemq.apollo.filter.BooleanExpression;
 import org.apache.activemq.apollo.filter.FilterException;
 import org.apache.activemq.apollo.filter.Filterable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * @openwire:marshaller code="91"
@@ -31,7 +29,6 @@ import org.apache.commons.logging.LogFac
 public class NetworkBridgeFilter implements DataStructure, BooleanExpression {
 
     public static final byte DATA_STRUCTURE_TYPE = CommandTypes.NETWORK_BRIDGE_FILTER;
-    static final Log LOG = LogFactory.getLog(NetworkBridgeFilter.class);
 
     private BrokerId networkBrokerId;
     private int networkTTL;
@@ -63,20 +60,12 @@ public class NetworkBridgeFilter impleme
     protected boolean matchesForwardingFilter(Message message) {
 
         if (contains(message.getBrokerPath(), networkBrokerId)) {
-            if (LOG.isTraceEnabled()) {
-                LOG.trace("Message all ready routed once through this broker ("
-                        + networkBrokerId + "), path: "
-                        + Arrays.toString(message.getBrokerPath()) + " - ignoring: " + message);
-            }
             return false;
         }
 
         int hops = message.getBrokerPath() == null ? 0 : message.getBrokerPath().length;
 
         if (hops >= networkTTL) {
-            if (LOG.isTraceEnabled()) {
-                LOG.trace("Message restricted to " + networkTTL + " network hops ignoring: " + message);
-            }
             return false;
         }
 
@@ -85,9 +74,6 @@ public class NetworkBridgeFilter impleme
             ConsumerInfo info = (ConsumerInfo)message.getDataStructure();
             hops = info.getBrokerPath() == null ? 0 : info.getBrokerPath().length;
             if (hops >= networkTTL) {
-                if (LOG.isTraceEnabled()) {
-                    LOG.trace("ConsumerInfo advisory restricted to " + networkTTL + " network hops ignoring: " + message);
-                }
                 return false;
             }
         }