Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorvaleriep
Fri, 06 Jan 2012 11:02:31 -0800
changeset 11508 fde1714f1745
parent 11507 bd978326a655 (current diff)
parent 11506 905dbb3e77eb (diff)
child 11509 02fb543bc69d
Merge
--- a/jdk/src/share/classes/java/nio/file/FileTreeWalker.java	Thu Jan 05 18:18:04 2012 -0800
+++ b/jdk/src/share/classes/java/nio/file/FileTreeWalker.java	Fri Jan 06 11:02:31 2012 -0800
@@ -92,7 +92,7 @@
             (System.getSecurityManager() == null))
         {
             BasicFileAttributes cached = ((BasicFileAttributesHolder)file).get();
-            if (!followLinks || !cached.isSymbolicLink())
+            if (cached != null && (!followLinks || !cached.isSymbolicLink()))
                 attrs = cached;
         }
         IOException exc = null;
jdk-sandbox