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

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

Author: dimitris at jboss.org
Date: 2007-02-27 13:41:42 -0500 (Tue, 27 Feb 2007)
New Revision: 60956

Modified:
   branches/Branch_4_2/system/src/main/org/jboss/Main.java
Log:
set java.rmi.server.hostname is not set either by -D or -b

Modified: branches/Branch_4_2/system/src/main/org/jboss/Main.java
===================================================================
--- branches/Branch_4_2/system/src/main/org/jboss/Main.java	2007-02-27 18:22:23 UTC (rev 60955)
+++ branches/Branch_4_2/system/src/main/org/jboss/Main.java	2007-02-27 18:41:42 UTC (rev 60956)
@@ -266,12 +266,6 @@
       props.setProperty(ServerConfig.SERVER_BIND_ADDRESS, "127.0.0.1");
       System.setProperty(ServerConfig.SERVER_BIND_ADDRESS, "127.0.0.1");
       
-      // Set the java.rmi.server.hostname if not set
-      if (System.getProperty("java.rmi.server.hostname") == null)
-      {
-         System.setProperty("java.rmi.server.hostname", "127.0.0.1");
-      }
-      
       while ((code = getopt.getopt()) != -1)
       {
          switch (code)
@@ -478,6 +472,12 @@
                throw new Error("unhandled option code: " + code);
          }
       }
+
+      // JBAS-4119, set the java.rmi.server.hostname if not set
+      if (System.getProperty("java.rmi.server.hostname") == null)
+      {
+         System.setProperty("java.rmi.server.hostname", "127.0.0.1");
+      }
    }
 
    /**