moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Avoid NPE in cleanup if NPOIFSFileSystem is opened on a locked File under Windows, and add a note on Java 7 possible cleanup #58098 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1693311 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2015-07-29 16:36:32 +00:00
parent b6b3853330
commit ca35f594a7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
View File

@ -232,20 +232,21 @@ public class NPOIFSFileSystem extends BlockStore
// Now process the various entries
readCoreContents();
} catch(IOException e) {
if(closeChannelOnError) {
channel.close();
// Until we upgrade to Java 7, and can do a MultiCatch, we
// need to keep these two catch blocks in sync on their cleanup
if (closeChannelOnError && channel != null) {
channel.close();
channel = null;
}
throw e;
} catch(RuntimeException e) {
// Comes from Iterators etc.
// TODO Decide if we can handle these better whilst
// still sticking to the iterator contract
if(closeChannelOnError) {
if (channel != null) {
channel.close();
channel = null;
}
}
if (closeChannelOnError && channel != null) {
channel.close();
channel = null;
}
throw e;
}
}