aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/java/net/InetAddress.java4
2 files changed, 9 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 160dce0..cf605f6 100644
--- 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 3306803..cfcf22b 100644
--- 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");