[jboss-cvs] JBoss Messaging SVN: r2275 - trunk/src/main/org/jboss/jms/server/endpoint.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2007-02-12 11:34:31 -0500 (Mon, 12 Feb 2007)
New Revision: 2275

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-826 - fix

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2007-02-12 16:25:21 UTC (rev 2274)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2007-02-12 16:34:31 UTC (rev 2275)
@@ -197,6 +197,8 @@
       // We don't need the SubjectContext on thread local anymore, clean it up
       SecurityAssociation.popSubjectContext();
 
+      String clientIDUsed = clientID;
+
       // see if there is a preconfigured client id for the user
       if (username != null)
       {
@@ -205,16 +207,19 @@
 
          if (preconfClientID != null)
          {
-            clientID = preconfClientID;
+            clientIDUsed = preconfClientID;
          }                  
       }
 
-      serverPeer.checkClientID(clientID);
+      if (clientIDUsed!=null)
+      {
+         serverPeer.checkClientID(clientIDUsed);
+      }
       
       // create the corresponding "server-side" connection endpoint and register it with the
       // server peer's ClientManager
       ServerConnectionEndpoint endpoint =
-         new ServerConnectionEndpoint(serverPeer, clientID, username, password, prefetchSize,
+         new ServerConnectionEndpoint(serverPeer, clientIDUsed, username, password, prefetchSize,
                                       defaultTempQueueFullSize, defaultTempQueuePageSize,
                                       defaultTempQueueDownCacheSize, failedNodeID, this,
                                       remotingSessionID, clientVMID, versionToUse,