stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8056205: (fs) Potential for NPE in Files.walkFileTree if closing directory fails

Browse Source 
Change incorrect ioe != null to ioe == null

Reviewed-by: rriggs
This commit is contained in:
Brian Burkhalter 2016-12-21 11:54:42 -08:00
parent 8f9235fc56
commit ce3243b0a6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -353,12 +353,13 @@ class FileTreeWalker implements Closeable {
} }
} }
// no next entry so close and pop directory, creating corresponding event // no next entry so close and pop directory,
// creating corresponding event
if (entry == null) { if (entry == null) {
try { try {
top.stream().close(); top.stream().close();
} catch (IOException e) { } catch (IOException e) {
if (ioe != null) { if (ioe == null) {
ioe = e; ioe = e;
} else { } else {
ioe.addSuppressed(e); ioe.addSuppressed(e);