Connection.java (unquote): New method.

2005-07-13  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 (getInputStream):
        Likewise.
        (getJarFile): Likewise.

        * java/net/URLConnection.java (getContentHandler): Guard cast with
        instaceof.

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

From-SVN: r102029
This commit is contained in:
Andrew Haley 2005-07-14 18:20:10 +00:00 committed by Andrew Haley
parent b11e14262e
commit 3fefd0193c
5 changed files with 91 additions and 17 deletions

View file

@ -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.