use try with resources

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

diff --git a/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java b/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
index 8b5e1ac5886eea1e10ffe579a56afc97b6adfd43..6a5fa620a734df969bdf0b5bce227d4dc510ce7e 100644 (file)
--- 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");
     }