activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r473183 - in /incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq: ActiveMQConnection.java ActiveMQConnectionFactory.java
Date Fri, 10 Nov 2006 04:27:50 GMT
Author: chirino
Date: Thu Nov  9 20:27:49 2006
New Revision: 473183

URL: http://svn.apache.org/viewvc?view=rev&rev=473183
Log:
Merged in revision 473167 from trunk

Modified:
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?view=diff&rev=473183&r1=473182&r2=473183
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
Thu Nov  9 20:27:49 2006
@@ -358,6 +358,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.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?view=diff&rev=473183&r1=473182&r2=473183
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
Thu Nov  9 20:27:49 2006
@@ -242,7 +242,7 @@
             transport.start();
 
             if( clientID !=null )
-                connection.setClientID(clientID);
+                connection.setDefaultClientID(clientID);
 
             return connection;
         }



Mime
View raw message