[jboss-remoting-commits] JBoss Remoting SVN: r3734 - remoting2/branches/2.2/src/main/org/jboss/remoting.

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

Author: ron.sigal at jboss.com
Date: 2008-03-23 04:59:30 -0400 (Sun, 23 Mar 2008)
New Revision: 3734

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java
Log:
JBREM-915: resolveHost() checks for host == null.

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java	2008-03-22 06:50:06 UTC (rev 3733)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java	2008-03-23 08:59:30 UTC (rev 3734)
@@ -330,8 +330,12 @@
 
    private static final String resolveHost(String host)
    {
-      if(host.indexOf("0.0.0.0") != -1)
+      if (host == null)
       {
+         host = fixRemoteAddress(host);
+      }
+      else if(host.indexOf("0.0.0.0") != -1)
+      {
          if(System.getProperty(SERVER_BIND_ADDRESS, "0.0.0.0").equals("0.0.0.0"))
          {
             host = fixRemoteAddress(host);
@@ -341,7 +345,7 @@
             host = host.replaceAll("0\\.0\\.0\\.0", System.getProperty(SERVER_BIND_ADDRESS));
          }
       }
-         return host;
+      return host;
    }
 
    private static String fixRemoteAddress(String address)