diff options
-rw-r--r-- | src/java/org/apache/poi/poifs/macros/VBAMacroReader.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java b/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java index 8b5e1ac588..6a5fa620a7 100644 --- a/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java +++ b/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java @@ -83,24 +83,24 @@ public class VBAMacroReader implements Closeable { } private void openOOXML(InputStream zipFile) throws IOException { - ZipInputStream zis = new ZipInputStream(zipFile); - ZipEntry zipEntry; - while ((zipEntry = zis.getNextEntry()) != null) { - if (endsWithIgnoreCase(zipEntry.getName(), VBA_PROJECT_OOXML)) { - try { - // Make a NPOIFS from the contents, and close the stream - this.fs = new NPOIFSFileSystem(zis); - return; - } catch (IOException e) { - // Tidy up - zis.close(); - - // Pass on - throw e; + try(ZipInputStream zis = new ZipInputStream(zipFile)) { + ZipEntry zipEntry; + while ((zipEntry = zis.getNextEntry()) != null) { + if (endsWithIgnoreCase(zipEntry.getName(), VBA_PROJECT_OOXML)) { + try { + // Make a NPOIFS from the contents, and close the stream + this.fs = new NPOIFSFileSystem(zis); + return; + } catch (IOException e) { + // Tidy up + zis.close(); + + // Pass on + throw e; + } } } } - zis.close(); throw new IllegalArgumentException("No VBA project found"); } |