Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 26814 invoked from network); 10 Nov 2006 04:19:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Nov 2006 04:19:48 -0000 Received: (qmail 36176 invoked by uid 500); 10 Nov 2006 04:19:59 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 36127 invoked by uid 500); 10 Nov 2006 04:19:59 -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 36118 invoked by uid 99); 10 Nov 2006 04:19:59 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Nov 2006 20:19:59 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Nov 2006 20:19:47 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 5226B1A9846; Thu, 9 Nov 2006 20:19:19 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r473181 - in /incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq: ActiveMQConnection.java ActiveMQConnectionFactory.java Date: Fri, 10 Nov 2006 04:19:18 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061110041919.5226B1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Thu Nov 9 20:19:15 2006 New Revision: 473181 URL: http://svn.apache.org/viewvc?view=rev&rev=473181 Log: Merged in revision 473167 from trunk Modified: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java Modified: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?view=diff&rev=473181&r1=473180&r2=473181 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (original) +++ incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Thu Nov 9 20:19:15 2006 @@ -360,6 +360,16 @@ this.userSpecifiedClientID = true; ensureConnectionInfoSent(); } + + /** + * Sets the default client id that the connection will use if explicitly not set with + * the setClientId() call. + */ + public void setDefaultClientID(String clientID) throws JMSException { + this.info.setClientId(clientID); + this.userSpecifiedClientID = true; + } + /** * Gets the metadata for this connection. Modified: incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?view=diff&rev=473181&r1=473180&r2=473181 ============================================================================== --- incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java (original) +++ incubator/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java Thu Nov 9 20:19:15 2006 @@ -260,7 +260,7 @@ transport.start(); if( clientID !=null ) - connection.setClientID(clientID); + connection.setDefaultClientID(clientID); return connection; }