From 52e8997b1823ac09491aa775ff8064ea2459aaee Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Wed, 15 Feb 2012 11:51:06 +0000
Subject: [PATCH] Fix bug #52665 - When reading from a ZipFileZipEntrySource
 that has already been closed, give IllegalArgumentException rather than NPE

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1244450 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/status.xml                  | 1 +
 .../apache/poi/openxml4j/util/ZipFileZipEntrySource.java    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 665a6cb18..31402b148 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.8-beta6" date="2012-??-??">
+           <action dev="poi-developers" type="fix">52665 - When reading from a ZipFileZipEntrySource that has already been closed, give IllegalArgumentException rather than NPE</action>
            <action dev="poi-developers" type="fix">52664 - MAPIMessage may not always have name chunks when checking for 7 bit encodings</action>
            <action dev="poi-developers" type="fix">52649 - fixed namespace issue in WordToFoConverter</action>
            <action dev="poi-developers" type="fix">52385 - avoid trancated array and vector data when reading OLE properties</action>
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java b/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
index 5c2b7b35e..f4117f44b 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
@@ -41,10 +41,16 @@ public class ZipFileZipEntrySource implements ZipEntrySource {
    }
 
    public Enumeration<? extends ZipEntry> getEntries() {
+      if (zipArchive == null)
+         throw new IllegalStateException("Zip File is closed");
+      
       return zipArchive.entries();
    }
 
    public InputStream getInputStream(ZipEntry entry) throws IOException {
+      if (zipArchive == null)
+         throw new IllegalStateException("Zip File is closed");
+      
       return zipArchive.getInputStream(entry);
    }
 }