From a37e9881b265a5026ad89fcb8e0fd3c6a53b60bd Mon Sep 17 00:00:00 2001 From: Paul Govereau Date: Tue, 9 Sep 2014 11:55:47 -0400 Subject: [PATCH] 8055500: fix for 8030046 is incorrect Reviewed-by: jjg, ksrini --- .../share/classes/com/sun/tools/javac/file/FSInfo.java | 8 ++++---- langtools/test/tools/javac/Paths/AbsolutePathTest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java index f2c1fc80074..7fcdb2b69d9 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java @@ -82,10 +82,10 @@ public class FSInfo { for (StringTokenizer st = new StringTokenizer(path); st.hasMoreTokens(); ) { String elt = st.nextToken(); - try { - File f = parent == null ? new File(elt): new File(file.toURI().resolve(elt)); - list.add(f); - } catch (IllegalArgumentException ex) {} + File f = new File(elt); + if (!f.isAbsolute() && parent != null) + f = new File(parent,elt).getAbsoluteFile(); + list.add(f); } return list; diff --git a/langtools/test/tools/javac/Paths/AbsolutePathTest.java b/langtools/test/tools/javac/Paths/AbsolutePathTest.java index e0e41a8118c..0e15244f57a 100644 --- a/langtools/test/tools/javac/Paths/AbsolutePathTest.java +++ b/langtools/test/tools/javac/Paths/AbsolutePathTest.java @@ -23,11 +23,11 @@ /* * @test - * @ignore 8055500 [javac] fix for 8030046 is incorrect - * @bug 8030046 + * @bug 8030046 8055500 * @summary javac incorrectly handles absolute paths in manifest classpath * @author govereau * @library /tools/lib + * @ignore 8055768 ToolBox does not close opened files * @build ToolBox * @run main AbsolutePathTest */