svn commit: r636426 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java

[rajdavies]

Author: rajdavies
Date: Wed Mar 12 10:11:51 2008
New Revision: 636426

URL: http://svn.apache.org/viewvc?rev=636426&view=rev
Log:
Add network consumer id to a DemandSubscription

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

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java?rev=636426&r1=636425&r2=636426&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
 Wed Mar 12 10:11:51 2008
@@ -80,11 +80,13 @@
         if (addToAlreadyInterestedConsumers(info)) {
             return null; // don't want this subscription added
         }
+        //add our original id to ourselves
+        info.addNetworkConsumerId(info.getConsumerId());
         // not matched so create a new one
         // but first, if it's durable - changed set the
         // ConsumerId here - so it won't be removed if the
         // durable subscriber goes away on the other end
-        if (info.isDurable() || (info.getDestination().isQueue() && 
!info.getDestination().isTemporary())) {
+        if (info.isDurable() || (info.getDestination().isQueue() && 
!info.getDestination().isTemporary())) {  
             info.setConsumerId(new ConsumerId(localSessionInfo.getSessionId(), 
consumerIdGenerator
                 .getNextSequenceId()));
         }