Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Tue Dec 14 14:17:20 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Wed Dec 15 06:39:51 2010 -0800
     1.3 @@ -376,7 +376,8 @@
     1.4                  new SimpleFileVisitor<Path>() {
     1.5              @Override
     1.6              public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
     1.7 -                if (SourceVersion.isIdentifier(dir.getName().toString())) // JSR 292?
     1.8 +                Path name = dir.getName();
     1.9 +                if (name == null || SourceVersion.isIdentifier(name.toString())) // JSR 292?
    1.10                      return FileVisitResult.CONTINUE;
    1.11                  else
    1.12                      return FileVisitResult.SKIP_SUBTREE;

     2.1 --- a/test/tools/javac/nio/compileTest/CompileTest.java	Tue Dec 14 14:17:20 2010 -0800
     2.2 +++ b/test/tools/javac/nio/compileTest/CompileTest.java	Wed Dec 15 06:39:51 2010 -0800
     2.3 @@ -23,7 +23,7 @@
     2.4  
     2.5  /**
     2.6   * @test
     2.7 - * @bug 6906175 6915476 6915497
     2.8 + * @bug 6906175 6915476 6915497 7006564
     2.9   * @summary Path-based JavaFileManager
    2.10   * @compile -g HelloPathWorld.java
    2.11   * @run main CompileTest