From e2195c505fc3f3b88ef34a08b45955db14329b54 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 7 Jun 2018 06:03:35 +0000 Subject: [PATCH] use try with resources git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1833096 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/poifs/macros/VBAMacroReader.java | 30 +++++++++---------- 1 file 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"); } -- 2.39.5