# HG changeset patch
# User alanb
# Date 1286131215 -3600
# Node ID 7a6305ae07218bb9c324623c3fd386f6fbc7e250
# Parent  d920738442781a1bea3c728a8180c23fc016955d
6907737: (file) FileVisitor and Files.walkFileTree issues
Reviewed-by: jjg

diff -r d92073844278 -r 7a6305ae0721 langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Thu Sep 30 10:47:12 2010 -0700
+++ b/langtools/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