re PR libgcj/17069 (InetAddress.getLocalHost() returns broken InetAddress object...

2005-01-09  Michael Koch  <konqueror@gmx.de>

	PR libgcj/17069
	* java/net/InetAddress.java (getLocalHost):
	Throw UnknownHostException if local hostname cannot be determined.

From-SVN: r93115

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 160dce07231ab321f982ac129c3b04d2aa8a3f6b..cf605f62aa3d755c4ee6e0ac8e400c46a66cc9a3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-09  Michael Koch  <konqueror@gmx.de>
+
+       PR libgcj/17069
+       * java/net/InetAddress.java (getLocalHost):
+       Throw UnknownHostException if local hostname cannot be determined.
+
 2005-01-06  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/ClassLoader.java (findClass): Fixed documentation.

diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index 3306803188405ed3e06ab89a52cbfe078d29edaf..cfcf22b42682745498b3975d6295cebde1b6c868 100644 (file)
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -714,7 +714,7 @@ public class InetAddress implements Serializable
          }
       }
     
-    if (hostname != null)
+    if (hostname != null && hostname.length() != 0)
       {
        try
          {
@@ -725,6 +725,8 @@ public class InetAddress implements Serializable
          {
          }
       }
+    else
+      throw new UnknownHostException();
     
     if (localhost == null)
       localhost = new InetAddress (loopbackAddress, "localhost");