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

libjava/java/net/URL.java

@@ -1,5 +1,5 @@
 /* URL.java -- Uniform Resource Locator Class
-   Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -147,7 +147,7 @@ public final class URL implements Serializable
   /**
    * The protocol handler in use for this URL
    */
-  transient private URLStreamHandler handler;
+  transient URLStreamHandler handler;
 
   /**
    * This a table where we cache protocol handlers to avoid the overhead

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();