Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 59941 invoked from network); 8 Mar 2006 14:37:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Mar 2006 14:37:03 -0000 Received: (qmail 29156 invoked by uid 500); 8 Mar 2006 14:36:58 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 29079 invoked by uid 500); 8 Mar 2006 14:36:58 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 29048 invoked by uid 99); 8 Mar 2006 14:36:58 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Mar 2006 06:36:58 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 08 Mar 2006 06:36:57 -0800 Received: (qmail 59779 invoked by uid 65534); 8 Mar 2006 14:36:37 -0000 Message-ID: <20060308143637.59776.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r384223 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicView.java Date: Wed, 08 Mar 2006 14:36:36 -0000 To: activemq-commits@geronimo.apache.org From: jstrachan@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jstrachan Date: Wed Mar 8 06:36:35 2006 New Revision: 384223 URL: http://svn.apache.org/viewcvs?rev=384223&view=rev Log: added fix for NPE when adding durable subscribers Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicView.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicView.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicView.java?rev=384223&r1=384222&r2=384223&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicView.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicView.java Wed Mar 8 06:36:35 2006 @@ -15,11 +15,13 @@ import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.broker.region.Topic; +import org.apache.activemq.command.ConsumerId; import org.apache.activemq.command.ConsumerInfo; import org.apache.activemq.command.RemoveSubscriptionInfo; + public class TopicView extends DestinationView implements TopicViewMBean{ - public TopicView(ManagedRegionBroker broker, Topic destination){ + public TopicView(ManagedRegionBroker broker, Topic destination){ super(broker, destination); } @@ -28,6 +30,11 @@ context.setBroker(broker); context.setClientId(clientId); ConsumerInfo info = new ConsumerInfo(); + ConsumerId consumerId = new ConsumerId(); + consumerId.setConnectionId(clientId); + consumerId.setSessionId(0); + consumerId.setValue(0); + info.setConsumerId(consumerId); info.setDestination(destination.getActiveMQDestination()); info.setSubcriptionName(subscriberName); broker.addConsumer(context, info);