You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2008/04/10 19:28:38 UTC

svn commit: r646887 - /geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Net.java

Author: rickmcguire
Date: Thu Apr 10 10:28:28 2008
New Revision: 646887

URL: http://svn.apache.org/viewvc?rev=646887&view=rev
Log:
YOKO-427 Long startup delay when creating a POA on a disconnected system.


Modified:
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Net.java

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Net.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Net.java?rev=646887&r1=646886&r2=646887&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Net.java (original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Net.java Thu Apr 10 10:28:28 2008
@@ -46,27 +46,12 @@
 
         try {
             if (!numeric) {
-                host = java.net.InetAddress.getLocalHost()
-                        .getCanonicalHostName();
-
-                if (host.lastIndexOf('.') == -1) {
-                    // logger.warning("ORB_init: " +
-                    // "hostname is a domainless name\n" +
-                    // "using dotted decimal notation " +
-                    // "instead of hostname");
-
-                    host = java.net.InetAddress.getLocalHost().getHostAddress();
-                }
+                host = java.net.InetAddress.getLocalHost().getHostName(); 
             } else {
                 host = java.net.InetAddress.getLocalHost().getHostAddress();
             }
 
             if (host.equals("127.0.0.1") || host.equals("localhost")) {
-                // logger.warning("ORB_init: " +
-                // "hostname lookup returned " +
-                // "`localhost' (127.0.0.1)\n" +
-                // "Use the -IIOPhost option to select " +
-                // "some other hostname");
             }
         } catch (java.net.UnknownHostException ex) {
             // logger.warning("ORB_init: " +