changeset 26535:24dfa5fd8fe2

8055500: fix for 8030046 is incorrect Reviewed-by: jjg, ksrini
author pgovereau
date Tue, 09 Sep 2014 11:55:47 -0400
parents 43bd005b6972
children 730984f89f90
files langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java langtools/test/tools/javac/Paths/AbsolutePathTest.java
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java	Mon Sep 08 15:51:29 2014 +0200
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java	Tue Sep 09 11:55:47 2014 -0400
@@ -82,10 +82,10 @@
             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;
--- a/langtools/test/tools/javac/Paths/AbsolutePathTest.java	Mon Sep 08 15:51:29 2014 +0200
+++ b/langtools/test/tools/javac/Paths/AbsolutePathTest.java	Tue Sep 09 11:55:47 2014 -0400
@@ -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
  */