From 7c5c57d2f73b5776b88f94ce76c04a1125ecef32 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 12 Sep 2003 01:08:18 +0000 Subject: * 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 "/". git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71327 138bc75d-0d04-0410-961f-82ee72b054a4 --- 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 93a8ab27814..61b466cce6d 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.2.3