From 030612a110957f96af1496e1cbf0be58a1cd1359 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 12 Sep 2003 01:08:18 +0000 Subject: URLStreamHandler.java (parseURL): If original file ends with "/", so must canonical result. * java/net/URLStreamHandler.java (parseURL): If original file ends with "/", so must canonical result. * java/io/natFilePosix.cc (getCanonicalPath): Clean up snafus with nul-termination and finding previous "/". From-SVN: r71327 --- libjava/java/net/URLStreamHandler.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libjava/java/net/URLStreamHandler.java') diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java index 93a8ab2..61b466c 100644 --- a/libjava/java/net/URLStreamHandler.java +++ b/libjava/java/net/URLStreamHandler.java @@ -196,7 +196,11 @@ public abstract class URLStreamHandler // need to canonicalise the file path. try { + boolean endsWithSlash = file.charAt(file.length() - 1) == '/'; file = new File (file).getCanonicalPath (); + if (endsWithSlash + && file.charAt(file.length() - 1) != '/') + file += '/'; } catch (IOException e) { -- cgit v1.1