6907737: (file) FileVisitor and Files.walkFileTree issues

Sun, 03 Oct 2010 19:40:15 +0100

author
alanb
date
Sun, 03 Oct 2010 19:40:15 +0100
changeset 701
232919708730
parent 700
7b413ac1a720
child 702
2c321dcb1edc
child 706
971c8132f5b2

6907737: (file) FileVisitor and Files.walkFileTree issues
Reviewed-by: jjg

src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Thu Sep 30 10:47:12 2010 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Sun Oct 03 19:40:15 2010 +0100
     1.3 @@ -366,11 +366,11 @@
     1.4  //            }
     1.5  //        }
     1.6          int maxDepth = (recurse ? Integer.MAX_VALUE : 1);
     1.7 -        Set<FileVisitOption> opts = EnumSet.of(DETECT_CYCLES, FOLLOW_LINKS);
     1.8 +        Set<FileVisitOption> opts = EnumSet.of(FOLLOW_LINKS);
     1.9          Files.walkFileTree(packageDir, opts, maxDepth,
    1.10                  new SimpleFileVisitor<Path>() {
    1.11              @Override
    1.12 -            public FileVisitResult preVisitDirectory(Path dir) {
    1.13 +            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
    1.14                  if (SourceVersion.isIdentifier(dir.getName().toString())) // JSR 292?
    1.15                      return FileVisitResult.CONTINUE;
    1.16                  else

mercurial