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

7006564: NPE in javac running test/tools/javac/nio/compileTest/CompileTest.java

Browse Source 
Reviewed-by: mcimadamore, alanb
This commit is contained in:
Jonathan Gibbons 2010-12-15 06:39:51 -08:00
parent cfe2f7eb5d
commit facb1c1b6d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
View File

@ -376,7 +376,8 @@ public class JavacPathFileManager extends BaseFileManager implements PathFileMan
new SimpleFileVisitor<Path>() { new SimpleFileVisitor<Path>() {
@Override @Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) { public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
if (SourceVersion.isIdentifier(dir.getName().toString())) // JSR 292? Path name = dir.getName();
if (name == null || SourceVersion.isIdentifier(name.toString())) // JSR 292?
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
else else
return FileVisitResult.SKIP_SUBTREE; return FileVisitResult.SKIP_SUBTREE;

2
langtools/test/tools/javac/nio/compileTest/CompileTest.java
View File

@ -23,7 +23,7 @@
/** /**
* @test * @test
* @bug 6906175 6915476 6915497 * @bug 6906175 6915476 6915497 7006564
* @summary Path-based JavaFileManager * @summary Path-based JavaFileManager
* @compile -g HelloPathWorld.java * @compile -g HelloPathWorld.java
* @run main CompileTest * @run main CompileTest