From f9cc04e5dbbc247954408b952524a21aa35d50c9 Mon Sep 17 00:00:00 2001 From: Robert Davies Date: Wed, 12 Mar 2008 17:11:51 +0000 Subject: [PATCH] Add network consumer id to a DemandSubscription git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636426 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/activemq/network/DurableConduitBridge.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java b/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java index e2459feca6..39166e1802 100644 --- a/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java +++ b/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java @@ -80,11 +80,13 @@ public class DurableConduitBridge extends ConduitBridge { 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())); }