diff options
| author | Anthony Green <green@redhat.com> | 2003-06-08 22:07:48 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2003-06-08 22:07:48 +0000 |
| commit | a8a8de48756b3c27e28e616b31886e84bf937f05 (patch) | |
| tree | 17da92559877904ab4b92fcd89330f000a62e5eb /libjava/java/net/URLStreamHandler.java | |
| parent | 51d2dfa601d743ba2f4cbe4e70691a3a6ddf2fa6 (diff) | |
| download | gcc-a8a8de48756b3c27e28e616b31886e84bf937f05.zip gcc-a8a8de48756b3c27e28e616b31886e84bf937f05.tar.gz gcc-a8a8de48756b3c27e28e616b31886e84bf937f05.tar.bz2 | |
URLStreamHandler.java (sameFile): Fix port value comparison.
2003-06-08 Anthony Green <green@redhat.com>
* java/net/URLStreamHandler.java (sameFile): Fix port value
comparison.
* java/net/URL.java (handler): Make package private.
* gnu/gcj/protocol/http/Handler.java (getDefaultPort): New method.
From-SVN: r67640
Diffstat (limited to 'libjava/java/net/URLStreamHandler.java')
| -rw-r--r-- | libjava/java/net/URLStreamHandler.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java index 37183b9..604279d 100644 --- a/libjava/java/net/URLStreamHandler.java +++ b/libjava/java/net/URLStreamHandler.java @@ -265,7 +265,15 @@ public abstract class URLStreamHandler return true; // This comparison is very conservative. It assumes that any // field can be null. - if (url1 == null || url2 == null || url1.getPort() != url2.getPort()) + if (url1 == null || url2 == null) + return false; + int p1 = url1.getPort (); + if (p1 == -1) + p1 = url1.handler.getDefaultPort (); + int p2 = url2.getPort (); + if (p2 == -1) + p2 = url2.handler.getDefaultPort (); + if (p1 != p2) return false; String s1, s2; s1 = url1.getProtocol(); |