diff --git a/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java index b74fe844ea..21d07519be 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java @@ -57,10 +57,6 @@ public class ConduitBridge extends DemandForwardingBridge { } protected boolean addToAlreadyInterestedConsumers(ConsumerInfo info) { - if (info.getSelector() != null) { - return false; - } - // search through existing subscriptions and see if we have a match boolean matched = false; DestinationFilter filter = DestinationFilter.parseFilter(info.getDestination()); diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java b/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java index 4a23667db0..6dea9743d0 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java @@ -37,6 +37,7 @@ public class DemandSubscription { DemandSubscription(ConsumerInfo info) { remoteInfo = info; localInfo = info.copy(); + localInfo.setSelector(null); localInfo.setBrokerPath(info.getBrokerPath()); localInfo.setNetworkSubscription(true); remoteSubsIds.add(info.getConsumerId());