2006-08-14 Mark Wielaard <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116139 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 12 insertions, 9 deletions

diff --git a/libjava/classpath/java/net/URLStreamHandler.java b/libjava/classpath/java/net/URLStreamHandler.java
index ed95092219e..9a5d73ad0d0 100644
--- a/libjava/classpath/java/net/URLStreamHandler.java
+++ b/libjava/classpath/java/net/URLStreamHandler.java
@@ -369,13 +369,11 @@ public abstract class URLStreamHandler
   }
 
   /**
-   * Provides the default equals calculation. May be overidden by handlers for
-   * other protocols that have different requirements for equals(). This method
-   * requires that none of its arguments is null. This is guaranteed by the
-   * fact that it is only called by java.net.URL class.
+   * This is the default method for computing whether two URLs are
+   * equivalent.  This method assumes that neither URL is null.
    *
    * @param url1 An URL object
-   * @param url2 An URL object
+   * @param url2 Another URL object
    *
    * @return True if both given URLs are equal, false otherwise.
    */
@@ -383,16 +381,21 @@ public abstract class URLStreamHandler
   {
     // This comparison is very conservative.  It assumes that any
     // field can be null.
-    return (url1.getPort() == url2.getPort()
+    int port1 = url1.getPort();
+    if (port1 == -1)
+      port1 = url1.getDefaultPort();
+    int port2 = url2.getPort();
+    if (port2 == -1)
+      port2 = url2.getDefaultPort();
+    // Note that we don't bother checking the 'authority'; it is
+    // redundant.
+    return (port1 == port2
            && ((url1.getProtocol() == null && url2.getProtocol() == null)
            || (url1.getProtocol() != null
            && url1.getProtocol().equals(url2.getProtocol())))
            && ((url1.getUserInfo() == null && url2.getUserInfo() == null)
            || (url1.getUserInfo() != null
            && url1.getUserInfo().equals(url2.getUserInfo())))
-           && ((url1.getAuthority() == null && url2.getAuthority() == null)
-           || (url1.getAuthority() != null
-           && url1.getAuthority().equals(url2.getAuthority())))
            && ((url1.getHost() == null && url2.getHost() == null)
            || (url1.getHost() != null && url1.getHost().equals(url2.getHost())))
            && ((url1.getPath() == null && url2.getPath() == null)