From a8a8de48756b3c27e28e616b31886e84bf937f05 Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Sun, 8 Jun 2003 22:07:48 +0000 Subject: URLStreamHandler.java (sameFile): Fix port value comparison. 2003-06-08 Anthony Green * 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 --- libjava/java/net/URLStreamHandler.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'libjava/java/net/URLStreamHandler.java') diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java index 37183b9633e..604279defa2 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(); -- cgit v1.2.3