[jboss-cvs] JBoss Messaging SVN: r2361 - trunk/src/main/org/jboss/jms/client/remoting.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-02-19 20:00:18 -0500 (Mon, 19 Feb 2007)
New Revision: 2361

Modified:
   trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
Log:
svn merge  -r 2324:HEAD https://svn.jboss.org/repos/messaging/branches/Branch_Bisocket_Experiment2

Modified: trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-02-20 00:51:55 UTC (rev 2360)
+++ trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-02-20 01:00:18 UTC (rev 2361)
@@ -129,6 +129,17 @@
             // which creates ServerSockets.  The actual value of the port shouldn't matter.
             if (propertyPort == null)
                metadata.put(Client.CALLBACK_SERVER_PORT, Integer.toString(new GUID().hashCode()));
+ 
+            // Setting the port prevents the Remoting Client from using PortUtil.findPort(),
+            // which creates ServerSockets.  The actual value of the port shouldn't matter.
+            // To "guarantee" that each InvokerLocator is unique, a GUID is appended to
+            // the InvokerLocator.
+            if (propertyPort == null)
+            {
+               String guid = new GUID().toString();
+               metadata.put(Client.CALLBACK_SERVER_PORT, Integer.toString(guid.hashCode()));
+               metadata.put("guid", guid);
+            }
          }
       }
       else