[jboss-cvs] JBossAS SVN: r102579 - trunk/main/src/main/java/org/jboss.

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

Author: david.lloyd at jboss.com
Date: 2010-03-18 15:17:20 -0400 (Thu, 18 Mar 2010)
New Revision: 102579

Modified:
   trunk/main/src/main/java/org/jboss/Main.java
Log:
Avoid a problem where an unnamed localhost might prevent the server from starting

Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java	2010-03-18 19:16:45 UTC (rev 102578)
+++ trunk/main/src/main/java/org/jboss/Main.java	2010-03-18 19:17:20 UTC (rev 102579)
@@ -203,9 +203,16 @@
          }
          if (qualifiedHostName == null)
          {
-            qualifiedHostName = InetAddress.getLocalHost().getHostName();
+            try
+            {
+               qualifiedHostName = InetAddress.getLocalHost().getHostName();
+            }
+            catch (UnknownHostException e)
+            {
+               qualifiedHostName = null;
+            }
          }
-         if (qualifiedHostName.matches("^\\d+\\.\\d+\\.\\d+\\.\\d+$|:"))
+         if (qualifiedHostName != null && qualifiedHostName.matches("^\\d+\\.\\d+\\.\\d+\\.\\d+$|:"))
          {
             // IP address is not acceptable
             qualifiedHostName = null;