From a34664c6badfc80216a1b37ad50c1d89f8434f22 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sun, 9 Jan 2005 18:57:32 +0000 Subject: [PATCH] re PR libgcj/17069 (InetAddress.getLocalHost() returns broken InetAddress object if hostname not set) 2005-01-09 Michael Koch PR libgcj/17069 * java/net/InetAddress.java (getLocalHost): Throw UnknownHostException if local hostname cannot be determined. From-SVN: r93115 --- libjava/ChangeLog | 6 ++++++ libjava/java/net/InetAddress.java | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 160dce07231..cf605f62aa3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-01-09 Michael Koch + + PR libgcj/17069 + * java/net/InetAddress.java (getLocalHost): + Throw UnknownHostException if local hostname cannot be determined. + 2005-01-06 Tom Tromey * java/lang/ClassLoader.java (findClass): Fixed documentation. diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index 33068031884..cfcf22b4268 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");