2003-06-20 Michael Koch <konqueror@gmx.de>

	* java/net/URLStreamHandler.java
	(hostsEqual): Rewritten.

From-SVN: r68260

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2d2ffb7a24d513fc034839162bca908e1c500035..ea778ed1679b2ea64145a2659a738321122b5a97 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-20  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/URLStreamHandler.java
+       (hostsEqual): Rewritten.
+
 2003-06-20  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/nio/MappedByteFileBuffer.java,

diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java
index 604279defa27a8d927078d2cba4600cabb06c7cf..36c021d2a719d28623beda8e9301ecba927492e1 100644 (file)
--- 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;
   }
 
   /**