# HG changeset patch
# User jjg
# Date 1292423991 28800
# Node ID b022f7b7834218d25e604d5a06e1da15589d428b
# Parent  dfc4669cbc841c594f930c6fdeed1c3d73c2a68d
7006564: NPE in javac running test/tools/javac/nio/compileTest/CompileTest.java
Reviewed-by: mcimadamore, alanb

diff -r dfc4669cbc84 -r b022f7b78342 langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Tue Dec 14 14:17:20 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Wed Dec 15 06:39:51 2010 -0800
@@ -376,7 +376,8 @@
                 new SimpleFileVisitor<Path>() {
             @Override
             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;
                 else
                     return FileVisitResult.SKIP_SUBTREE;
diff -r dfc4669cbc84 -r b022f7b78342 langtools/test/tools/javac/nio/compileTest/CompileTest.java
--- a/langtools/test/tools/javac/nio/compileTest/CompileTest.java	Tue Dec 14 14:17:20 2010 -0800
+++ b/langtools/test/tools/javac/nio/compileTest/CompileTest.java	Wed Dec 15 06:39:51 2010 -0800
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 6906175 6915476 6915497
+ * @bug 6906175 6915476 6915497 7006564
  * @summary Path-based JavaFileManager
  * @compile -g HelloPathWorld.java
  * @run main CompileTest