OpenJDK / jdk8u / jdk8u / jdk
changeset 4909:e6ef778c1df4
Merge
| author | valeriep |
|---|---|
| date | Fri, 06 Jan 2012 11:02:31 -0800 |
| parents | cdc128128044 400cc379adb5 |
| children | 6720ae7b1448 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/nio/file/FileTreeWalker.java Thu Jan 05 18:18:04 2012 -0800 +++ b/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;