diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-20 12:07:22 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-20 12:07:22 +0000 |
| commit | 53a373dd8a9644fb36b2f7c33c7f078bc1df3392 (patch) | |
| tree | f7d8b4426fb62228bf9941b9246a08d1c467757e /libjava/java/net/URLStreamHandler.java | |
| parent | 8dced8246156096e927b806cfd8e2a8afded6a01 (diff) | |
| download | ppe42-gcc-53a373dd8a9644fb36b2f7c33c7f078bc1df3392.tar.gz ppe42-gcc-53a373dd8a9644fb36b2f7c33c7f078bc1df3392.zip | |
2003-06-20 Michael Koch <konqueror@gmx.de>
* java/net/URLStreamHandler.java
(hostsEqual): Rewritten.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68260 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net/URLStreamHandler.java')
| -rw-r--r-- | libjava/java/net/URLStreamHandler.java | 16 |
1 files changed, 12 insertions, 4 deletions
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; } /** |
