Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 48251 invoked from network); 4 Jul 2006 02:53:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Jul 2006 02:53:09 -0000 Received: (qmail 9516 invoked by uid 500); 4 Jul 2006 02:53:09 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 9489 invoked by uid 500); 4 Jul 2006 02:53:08 -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 9479 invoked by uid 99); 4 Jul 2006 02:53:08 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2006 19:53:08 -0700 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2006 19:53:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A2A661A983A; Mon, 3 Jul 2006 19:52:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r418900 - in /incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool: AbstractJmsClient.java JmsConsumerClient.java Date: Tue, 04 Jul 2006 02:52:47 -0000 To: activemq-commits@geronimo.apache.org From: aco@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060704025247.A2A661A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: aco Date: Mon Jul 3 19:52:46 2006 New Revision: 418900 URL: http://svn.apache.org/viewvc?rev=418900&view=rev Log: Fix setting of client ID to enable to run jboss durable subscriptions Modified: incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java Modified: incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java?rev=418900&r1=418899&r2=418900&view=diff ============================================================================== --- incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java (original) +++ incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/AbstractJmsClient.java Mon Jul 3 19:52:46 2006 @@ -79,6 +79,7 @@ public Connection getConnection() throws JMSException { if (jmsConnection == null) { jmsConnection = factory.createConnection(); + jmsConnection.setClientID(getClientName()); log.info("Creating JMS Connection: Provider=" + getClient().getJmsProvider() + ", JMS Spec=" + getClient().getJmsVersion()); } return jmsConnection; Modified: incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java?rev=418900&r1=418899&r2=418900&view=diff ============================================================================== --- incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java (original) +++ incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java Mon Jul 3 19:52:46 2006 @@ -165,14 +165,6 @@ } } - public Connection getConnection() throws JMSException { - Connection c = super.getConnection(); - if (c.getClientID() == null && client.isDurable()) { - c.setClientID(getClientName()); - } - return c; - } - public MessageConsumer createJmsConsumer() throws JMSException { Destination[] dest = createDestination(destIndex, destCount); return createJmsConsumer(dest[0]); @@ -184,7 +176,7 @@ if (clientName == null) { clientName = "JmsConsumer"; } - log.info("Creating durable subscriber to: " + dest.toString()); + log.info("Creating durable subscriber (" + getConnection().getClientID() + ") to: " + dest.toString()); jmsConsumer = getSession().createDurableSubscriber((Topic) dest, clientName); } else { log.info("Creating non-durable consumer to: " + dest.toString()); @@ -199,7 +191,7 @@ if (clientName == null) { clientName = "JmsConsumer"; } - log.info("Creating durable subscriber to: " + dest.toString()); + log.info("Creating durable subscriber (" + getConnection().getClientID() + ") to: " + dest.toString()); jmsConsumer = getSession().createDurableSubscriber((Topic) dest, clientName, selector, noLocal); } else { log.info("Creating non-durable consumer to: " + dest.toString());