Mercurial > hg > release > icedtea7-forest-2.0 > langtools

changeset 724:232919708730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6907737: (file) FileVisitor and Files.walkFileTree issues Reviewed-by: jjg
author alanb
date Sun, 03 Oct 2010 19:40:15 +0100
parents 7b413ac1a720
children 2c321dcb1edc 971c8132f5b2
files src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Thu Sep 30 10:47:12 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Sun Oct 03 19:40:15 2010 +0100
@@ -366,11 +366,11 @@
 //            }
 //        }
         int maxDepth = (recurse ? Integer.MAX_VALUE : 1);
-        Set<FileVisitOption> opts = EnumSet.of(DETECT_CYCLES, FOLLOW_LINKS);
+        Set<FileVisitOption> opts = EnumSet.of(FOLLOW_LINKS);
         Files.walkFileTree(packageDir, opts, maxDepth,
                 new SimpleFileVisitor<Path>() {
             @Override
-            public FileVisitResult preVisitDirectory(Path dir) {
+            public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
                 if (SourceVersion.isIdentifier(dir.getName().toString())) // JSR 292?
                     return FileVisitResult.CONTINUE;
                 else