[Jboss-cvs] JBoss Messaging SVN: r1262 - branches/Branch_1_0/src/main/org/jboss/jms/client/remoting

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

Author: clebert.suconic at jboss.com
Date: 2006-09-05 23:50:55 -0400 (Tue, 05 Sep 2006)
New Revision: 1262

Modified:
   branches/Branch_1_0/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java
Log:
JBMESSAGING-536 - proper fix using system property

Modified: branches/Branch_1_0/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java	2006-09-05 20:07:09 UTC (rev 1261)
+++ branches/Branch_1_0/src/main/org/jboss/jms/client/remoting/CallbackServerFactory.java	2006-09-06 03:50:55 UTC (rev 1262)
@@ -21,6 +21,7 @@
   */
 package org.jboss.jms.client.remoting;
 
+import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -59,6 +60,8 @@
    
    public static final String JMS_CALLBACK_SUBSYSTEM = "CALLBACK";
    
+   public static final String CLIENT_HOST = System.getProperty("jboss.messaging.callback.bind.address");
+   
    public static CallbackServerFactory instance = new CallbackServerFactory();
    
    private Map holders;
@@ -124,7 +127,13 @@
       String serializationType = null;
       int count = 0;
 
-      String thisAddress = serverLocator.getHost();
+      String thisAddress = CLIENT_HOST;
+      
+      if (thisAddress==null)
+      {
+    	  thisAddress = InetAddress.getLocalHost().getHostAddress();
+      }
+    	  
       boolean isSSL = serverLocator.getProtocol().equals("sslsocket");
       Map params = serverLocator.getParameters();