diff options
| author | Jeroen Frijters <jeroen@frijters.net> | 2004-11-18 20:24:33 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-11-18 20:24:33 +0000 |
| commit | 6e5b508490a8a67f277e965dd0e2ae3b073d3c9b (patch) | |
| tree | c7d4512809b5b3e84e209a40c6e526f523effae7 /libjava | |
| parent | c521478a7370617568dae0036ab9666a25e52f49 (diff) | |
| download | gcc-6e5b508490a8a67f277e965dd0e2ae3b073d3c9b.zip gcc-6e5b508490a8a67f277e965dd0e2ae3b073d3c9b.tar.gz gcc-6e5b508490a8a67f277e965dd0e2ae3b073d3c9b.tar.bz2 | |
2004-11-18 Jeroen Frijters <jeroen@frijters.net>
* java/net/URLStreamHandler.java
(parseURL): Fixed file path canonicalisation.
From-SVN: r90880
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/net/URLStreamHandler.java | 20 |
2 files changed, 8 insertions, 17 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d565ec0..6aeddd6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -3,6 +3,11 @@ * java/net/URLStreamHandler.java (parseURL): Fixed file path canonicalisation. +2004-11-18 Jeroen Frijters <jeroen@frijters.net> + + * java/net/URLStreamHandler.java + (parseURL): Fixed file path canonicalisation. + 2004-11-18 Michael Koch <konqueror@gmx.de> * java/net/URLClassLoader.java: Whitespace cleanup. diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java index 2e91eb6..fbe863f 100644 --- a/libjava/java/net/URLStreamHandler.java +++ b/libjava/java/net/URLStreamHandler.java @@ -214,23 +214,9 @@ public abstract class URLStreamHandler file = (file.substring(0, lastSlash) + '/' + spec.substring(start, end)); - if (url.getProtocol().equals("file")) - { - // For "file" URLs constructed relative to a context, we - // need to canonicalise the file path. - try - { - boolean endsWithSlash = file.charAt(file.length() - 1) == '/'; - file = new File(file).getCanonicalPath(); - file = file.replace(separator, '/'); - if (endsWithSlash && file.charAt(file.length() - 1) != '/') - file += '/'; - } - catch (IOException e) - { - // Do nothing. - } - } + // For URLs constructed relative to a context, we + // need to canonicalise the file path. + file = canonicalizeFilename(file); ref = null; } |