diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-06-20 12:07:22 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-06-20 12:07:22 +0000 |
| commit | f8b7363eedee2519b007fe6b449b7b3f9d652214 (patch) | |
| tree | f7d8b4426fb62228bf9941b9246a08d1c467757e /libjava | |
| parent | c52c9fec50c450ea3c495fcfa1267d89be6329de (diff) | |
| download | gcc-f8b7363eedee2519b007fe6b449b7b3f9d652214.zip gcc-f8b7363eedee2519b007fe6b449b7b3f9d652214.tar.gz gcc-f8b7363eedee2519b007fe6b449b7b3f9d652214.tar.bz2 | |
2003-06-20 Michael Koch <konqueror@gmx.de>
* java/net/URLStreamHandler.java
(hostsEqual): Rewritten.
From-SVN: r68260
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/net/URLStreamHandler.java | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2d2ffb7..ea778ed 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 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, gnu/java/nio/natMappedByteFileBuffer.cc: Removed 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; } /** |