From commits-return-8203-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Wed Mar 12 17:09:29 2008 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 22418 invoked from network); 12 Mar 2008 17:09:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Mar 2008 17:09:29 -0000 Received: (qmail 45067 invoked by uid 500); 12 Mar 2008 17:09:26 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 45005 invoked by uid 500); 12 Mar 2008 17:09:26 -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 44996 invoked by uid 99); 12 Mar 2008 17:09:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2008 10:09:26 -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:08:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 404C31A9838; Wed, 12 Mar 2008 10:09:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r636424 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java Date: Wed, 12 Mar 2008 17:09:07 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080312170908.404C31A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Wed Mar 12 10:08:48 2008 New Revision: 636424 URL: http://svn.apache.org/viewvc?rev=636424&view=rev Log: support a list of ConsumerId's from the network Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java?rev=636424&r1=636423&r2=636424&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ConsumerInfo.java Wed Mar 12 10:08:48 2008 @@ -16,6 +16,9 @@ */ package org.apache.activemq.command; +import java.util.ArrayList; +import java.util.List; + import org.apache.activemq.filter.BooleanExpression; import org.apache.activemq.state.CommandVisitor; @@ -54,6 +57,7 @@ protected BooleanExpression additionalPredicate; protected transient boolean networkSubscription; // this subscription + protected transient List networkConsumerIds; // the original consumerId // originated from a // network connection @@ -90,6 +94,13 @@ info.retroactive = retroactive; info.priority = priority; info.brokerPath = brokerPath; + info.networkSubscription = networkSubscription; + if (networkConsumerIds != null) { + if (info.networkConsumerIds==null){ + info.networkConsumerIds=new ArrayList(); + } + info.networkConsumerIds.addAll(networkConsumerIds); + } } public boolean isDurable() { @@ -391,6 +402,34 @@ public void setNoRangeAcks(boolean noRangeAcks) { this.noRangeAcks = noRangeAcks; + } + + public synchronized void addNetworkConsumerId(ConsumerId networkConsumerId) { + if (networkConsumerIds == null) { + networkConsumerIds = new ArrayList(); + } + networkConsumerIds.add(networkConsumerId); + } + + public synchronized void removeNetworkConsumerId(ConsumerId networkConsumerId) { + if (networkConsumerIds != null) { + networkConsumerIds.remove(networkConsumerId); + if (networkConsumerIds.isEmpty()) { + networkConsumerIds=null; + } + } + } + + public synchronized boolean isNetworkConsumersEmpty() { + return networkConsumerIds == null || networkConsumerIds.isEmpty(); + } + + public synchronized List getNetworkConsumerIds(){ + List result = new ArrayList(); + if (networkConsumerIds != null) { + result.addAll(networkConsumerIds); + } + return result; } }