[jboss-cvs] JBossAS SVN: r88272 - branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss.

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

Author: galder.zamarreno at jboss.com
Date: 2009-05-06 11:45:37 -0400 (Wed, 06 May 2009)
New Revision: 88272

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

Modified: branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/Main.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/Main.java	2009-05-06 15:44:56 UTC (rev 88271)
+++ branches/JBPAPP_4_2_0_GA_CP/system/src/main/org/jboss/Main.java	2009-05-06 15:45:37 UTC (rev 88272)
@@ -262,10 +262,15 @@
       int code;
       String arg;
       
-      // JBAS-4119, bind to localhost by default, instead of all NICs ("0.0.0.0")
-      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. 
+         // JBAS-4119, bind to localhost by default, instead of all NICs ("0.0.0.0")
+         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)