From 7caf5eda4c642fcb8bdf223ff71f8539e8ffab7b Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Wed, 29 Jul 2015 16:36:32 +0000 Subject: [PATCH] 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 --- .../poi/poifs/filesystem/NPOIFSFileSystem.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java index 9817c3d818..0bac7e1c74 100644 --- a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java +++ b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java @@ -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; } } -- 2.39.5