Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 23665 invoked from network); 12 Mar 2008 17:12:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Mar 2008 17:12:26 -0000 Received: (qmail 48498 invoked by uid 500); 12 Mar 2008 17:12:23 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 48475 invoked by uid 500); 12 Mar 2008 17:12:23 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 48466 invoked by uid 99); 12 Mar 2008 17:12:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2008 10:12:23 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2008 17:11:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E04C1A9832; Wed, 12 Mar 2008 10:12:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r636426 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java Date: Wed, 12 Mar 2008 17:12:01 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080312171202.8E04C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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())); }