7016704: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with new version of find (lnx)

Reviewed-by: forax

test/java/nio/file/Files/walkFileTree/PrintFileTree.java

@@ -54,6 +54,7 @@ public class PrintFileTree {
         if (followLinks)
             options.add(FileVisitOption.FOLLOW_LINKS);
 
+        final boolean follow = followLinks;
         final boolean reportCycles = printCycles;
         Files.walkFileTree(dir, options, Integer.MAX_VALUE, new FileVisitor<Path>() {
             @Override
@@ -63,7 +64,6 @@ public class PrintFileTree {
             }
             @Override
             public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
-                if (!attrs.isDirectory() || reportCycles)
                 System.out.println(file);
                 return FileVisitResult.CONTINUE;
             }
@@ -79,12 +79,14 @@ public class PrintFileTree {
             public FileVisitResult visitFileFailed(Path file, IOException exc)
                 throws IOException
             {
-                if (reportCycles && (exc instanceof FileSystemLoopException)) {
+                if (follow && (exc instanceof FileSystemLoopException)) {
+                    if (reportCycles)
                         System.out.println(file);
                     return FileVisitResult.CONTINUE;
-                }
+                } else {
                     throw exc;
                 }
+            }
         });
     }
 }