[jboss-cvs] JBoss Messaging SVN: r2362 - 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:02:23 -0500 (Mon, 19 Feb 2007)
New Revision: 2362

Modified:
   trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
Log:
eliminated small redundancy in the code

Modified: trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-02-20 01:00:18 UTC (rev 2361)
+++ trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-02-20 01:02:23 UTC (rev 2362)
@@ -125,16 +125,11 @@
          if ("bisocket".equals(protocol) || "sslbisocket".equals(protocol))
          {
             metadata.put(Bisocket.IS_CALLBACK_SERVER, "true");
-            // Setting the port prevents the Remoting Client from using PortUtil.findPort(),
-            // which creates ServerSockets.  The actual value of the port shouldn't matter.
+
+            // 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)
-               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()));