summaryrefslogtreecommitdiff
path: root/gnu/java/net/protocol
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2002-11-22 02:42:25 +0000
committerMark Wielaard <mark@klomp.org>2002-11-22 02:42:25 +0000
commit5a67ea15a20fa3ed6762988da6fd025d6d187b4b (patch)
tree4e5117232a033ad39861ce556e8899c073e5067e /gnu/java/net/protocol
parent59e70a12b5d3a05abf971dc7f939875aa9a2bee3 (diff)
downloadclasspath-5a67ea15a20fa3ed6762988da6fd025d6d187b4b.tar.gz
* java/util/jar/JarFile.java (getManifest): Throws IOException.
* java/net/URLClassLoader.java (JarURLLoader): Don't use gnu cache directly, use standard JarURLConnection.getJarFile(). (JarURLLoader.getManifest): Catch IOException. * gnu/java/net/protocol/jar/Handler.java (parseURL): Check for empty file part and only use url_String from start till end. * java/net/HttpURLConnection.java (HTTP_USE_PROXY): Add field. (HTTP_INTERNAL_ERROR): Constant value should be 501. * java/net/URLDecoder.java (decode): Throws Exception. * java/net/URL.html: Merge with libgcj (partly). * java/net/URLStreamHandler: Merge with libgcj.
Diffstat (limited to 'gnu/java/net/protocol')
-rw-r--r--gnu/java/net/protocol/jar/Handler.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/java/net/protocol/jar/Handler.java b/gnu/java/net/protocol/jar/Handler.java
index 140274905..75c3e405e 100644
--- a/gnu/java/net/protocol/jar/Handler.java
+++ b/gnu/java/net/protocol/jar/Handler.java
@@ -99,7 +99,8 @@ parseURL(URL url, String url_string, int start, int end)
// doing anything.
String file = url.getFile();
- if (file != null){ //has context url
+ if (file != null && file != ""){ //has context url
+ url_string = url_string.substring(start, end);
if (url_string.startsWith("/")){ //url string is an absolute path
int idx = file.lastIndexOf("!/");
if (idx == -1) //context path is weird
@@ -132,7 +133,7 @@ parseURL(URL url, String url_string, int start, int end)
return;
// Skip remains of protocol
- url_string = url_string.substring(start);
+ url_string = url_string.substring(start, end);
if ( !url.getProtocol().equals("jar") )
return;