2005-11-17 Andrew Haley <aph@redhat.com>

       * gnu/java/net/protocol/file/Connection.java (unquote): New
       method.
       (connect): Unquote filename.
       * gnu/java/net/protocol/jar/Connection.java (get): Likewise.

       * java/net/URL.java (URL): If the file part of a spec is absolute,
       ignore the file part of its context.

1 files changed, 6 insertions, 6 deletions

diff --git a/java/net/URL.java b/java/net/URL.java
index 627dbc391..1d947a0b4 100644
--- a/java/net/URL.java
+++ b/java/net/URL.java
@@ -408,10 +408,7 @@ public final class URL implements Serializable
 	    // The 1.2 doc specifically says these are copied to the new URL.
 	    host = context.host;
 	    port = context.port;
-	    file = context.file;
             userInfo = context.userInfo;
-	    if (file == null || file.length() == 0)
-	      file = "/";
 	    authority = context.authority;
 	  }
       }
@@ -423,10 +420,13 @@ public final class URL implements Serializable
 	protocol = context.protocol;
 	host = context.host;
 	port = context.port;
-	file = context.file;
         userInfo = context.userInfo;
-	if (file == null || file.length() == 0)
-	  file = "/";
+	if (spec.indexOf(":/", 1) < 0)
+	  {
+	    file = context.file;
+	    if (file == null || file.length() == 0)
+	      file = "/";
+	  }
 	authority = context.authority;
       }
     else // Protocol NOT specified in spec. and no context available.