aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/net/URLStreamHandler.java16
1 files changed, 12 insertions, 4 deletions
diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java
index 604279d..36c021d 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;
}
/**