stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8055500: fix for 8030046 is incorrect

Browse Source 
Reviewed-by: jjg, ksrini
This commit is contained in:
Paul Govereau 2014-09-09 11:55:47 -04:00
parent 2beda23cf8
commit a37e9881b2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/FSInfo.java
View File

@ -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;

4
langtools/test/tools/javac/Paths/AbsolutePathTest.java
View File

@ -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
*/