langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
changeset 27579 d1a63c99cdd5
parent 27226 53535e4e1b08
child 27858 443efec4bf09
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Tue Nov 18 15:25:18 2014 -0800
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Wed Dec 03 14:25:46 2014 +0000
@@ -368,7 +368,7 @@
             @Override
             public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
                 Path name = dir.getFileName();
-                if (name == null || SourceVersion.isIdentifier(name.toString())) // JSR 292?
+                if (name == null || SourceVersion.isIdentifier(name.toString()))
                     return FileVisitResult.CONTINUE;
                 else
                     return FileVisitResult.SKIP_SUBTREE;
@@ -377,6 +377,9 @@
             @Override
             public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
                 if (attrs.isRegularFile() && kinds.contains(getKind(file.getFileName().toString()))) {
+                    // WORKAROUND for .jimage files
+                    if (!file.isAbsolute())
+                        file = pathDir.resolve(file);
                     JavaFileObject fe =
                         PathFileObject.createDirectoryPathFileObject(
                             JavacPathFileManager.this, file, pathDir);