[jboss-cvs] JBossAS SVN: r61145 - branches/Branch_4_2/system/src/main/org/jboss.

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

Author: bstansberry at jboss.com
Date: 2007-03-06 12:47:07 -0500 (Tue, 06 Mar 2007)
New Revision: 61145

Modified:
   branches/Branch_4_2/system/src/main/org/jboss/Main.java
Log:
[JBAS-4181] If -b 0.0.0.0 is used, do not pass wildcard addresss through to JGroups

Modified: branches/Branch_4_2/system/src/main/org/jboss/Main.java
===================================================================
--- branches/Branch_4_2/system/src/main/org/jboss/Main.java	2007-03-06 14:42:48 UTC (rev 61144)
+++ branches/Branch_4_2/system/src/main/org/jboss/Main.java	2007-03-06 17:47:07 UTC (rev 61145)
@@ -332,11 +332,15 @@
                // ignore the new property
                if ("bind.address".equals(name))
                {
-                  System.setProperty("jgroups.bind_addr", value);
+                  // Wildcard address is not valid for JGroups
+                  String addr = ServerConfigUtil.fixRemoteAddress(value);
+                  System.setProperty("jgroups.bind_addr", addr);
                }
                else if ("jgroups.bind_addr".equals(name))
                {
-                  System.setProperty("bind.address", value);
+                  // Wildcard address is not valid for JGroups
+                  String addr = ServerConfigUtil.fixRemoteAddress(value);
+                  System.setProperty("bind.address", addr);
                }
                break;
             }
@@ -428,13 +432,18 @@
                String bindAddress = System.getProperty("bind.address");
                if (bindAddress == null)
                {
-                  System.setProperty("bind.address", arg);
+                  // Wildcard address is not valid for JGroups
+                  bindAddress = ServerConfigUtil.fixRemoteAddress(arg);
+                  System.setProperty("bind.address", bindAddress);
                }
                bindAddress = System.getProperty("jgroups.bind_addr");
                if (bindAddress == null)
                {
-                  System.setProperty("jgroups.bind_addr", arg);
+                  // Wildcard address is not valid for JGroups
+                  bindAddress = ServerConfigUtil.fixRemoteAddress(arg);
+                  System.setProperty("jgroups.bind_addr", bindAddress);
                }
+               
                // Set the java.rmi.server.hostname if not set
                String rmiHost = System.getProperty("java.rmi.server.hostname");
                if (rmiHost == null)