[jboss-cvs] JBossAS SVN: r88270 - branches/Branch_5_x/main/src/main/org/jboss.

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

Author: galder.zamarreno at jboss.com
Date: 2009-05-06 11:36:13 -0400 (Wed, 06 May 2009)
New Revision: 88270

Modified:
   branches/Branch_5_x/main/src/main/org/jboss/Main.java
Log:
[JBAS-6872] Set jboss.bind.address to localhost only if it hasn't been defined via run.conf.

Modified: branches/Branch_5_x/main/src/main/org/jboss/Main.java
===================================================================
--- branches/Branch_5_x/main/src/main/org/jboss/Main.java	2009-05-06 15:24:32 UTC (rev 88269)
+++ branches/Branch_5_x/main/src/main/org/jboss/Main.java	2009-05-06 15:36:13 UTC (rev 88270)
@@ -287,8 +287,13 @@
       Getopt getopt = new Getopt(programName, args, sopts, lopts);
       int code;
       String arg;
-      props.setProperty(ServerConfig.SERVER_BIND_ADDRESS, "127.0.0.1");
-      System.setProperty(ServerConfig.SERVER_BIND_ADDRESS, "127.0.0.1");
+      if (System.getProperty(ServerConfig.SERVER_BIND_ADDRESS) == null)
+      {
+         // ServerConfig.SERVER_BIND_ADDRESS could have been defined via 
+         // run.conf and so we don't wanna override that. 
+         props.setProperty(ServerConfig.SERVER_BIND_ADDRESS, "127.0.0.1");
+         System.setProperty(ServerConfig.SERVER_BIND_ADDRESS, "127.0.0.1");
+      }
       while ((code = getopt.getopt()) != -1)
       {
          switch (code)