activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r652305 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network: ConduitBridge.java DemandSubscription.java
Date Wed, 30 Apr 2008 06:52:36 GMT
Author: rajdavies
Date: Tue Apr 29 23:52:36 2008
New Revision: 652305

URL: http://svn.apache.org/viewvc?rev=652305&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1509

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java?rev=652305&r1=652304&r2=652305&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java
Tue Apr 29 23:52:36 2008
@@ -57,10 +57,6 @@
     }
 
     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());

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java?rev=652305&r1=652304&r2=652305&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java
Tue Apr 29 23:52:36 2008
@@ -37,6 +37,7 @@
     DemandSubscription(ConsumerInfo info) {
         remoteInfo = info;
         localInfo = info.copy();
+        localInfo.setSelector(null);
         localInfo.setBrokerPath(info.getBrokerPath());
         localInfo.setNetworkSubscription(true);
         remoteSubsIds.add(info.getConsumerId());    



Mime
View raw message