From f8b7363eedee2519b007fe6b449b7b3f9d652214 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 20 Jun 2003 12:07:22 +0000 Subject: [PATCH] 2003-06-20 Michael Koch * java/net/URLStreamHandler.java (hostsEqual): Rewritten. From-SVN: r68260 --- libjava/ChangeLog | 5 +++++ libjava/java/net/URLStreamHandler.java | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2d2ffb7a24d..ea778ed1679 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-06-20 Michael Koch + + * java/net/URLStreamHandler.java + (hostsEqual): Rewritten. + 2003-06-20 Michael Koch * gnu/java/nio/MappedByteFileBuffer.java, diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java index 604279defa2..36c021d2a71 100644 --- a/libjava/java/net/URLStreamHandler.java +++ b/libjava/java/net/URLStreamHandler.java @@ -380,12 +380,20 @@ public abstract class URLStreamHandler * @exception UnknownHostException If an unknown host is found */ protected boolean hostsEqual (URL url1, URL url2) - throws UnknownHostException { - InetAddress addr1 = InetAddress.getByName (url1.getHost ()); - InetAddress addr2 = InetAddress.getByName (url2.getHost ()); + InetAddress addr1 = getHostAddress (url1); + InetAddress addr2 = getHostAddress (url2); - return addr1.equals (addr2); + if (addr1 != null || addr2 != null) + return addr1.equals (addr2); + + String host1 = url1.getHost(); + String host2 = url2.getHost(); + + if (host1 != null && host2 != null) + return host1.equalsIgnoreCase (host2); + + return host1 == null && host2 == null; } /**