commit 6a0f8c54522a0167daeb482639d90164c5b9b5cc
author Nick Burch <nick@apache.org> Wed Jan 05 09:42:30 2011 +0000
committer Nick Burch <nick@apache.org> Wed Jan 05 09:42:30 2011 +0000
tree 4f66e4a40ef82fb3f24d635da9fc94a1b49a9bb9
parent 5ce8c4e6b1e14b5b843663470acae854a0501253

Sync with trunk for NPOIFS

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/NIO_32_BRANCH@1055380 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java

diff --git a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
index 8a7b683..58d77be 100644
--- a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
+++ b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
@@ -183,6 +183,14 @@
              channel.close();
           }
           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) {
+             channel.close();
+          }
+          throw e;
        }
     }