Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use try with resources 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1833096 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2018-06-07 06:03:35 +00:00
parent 1ba74b1da9
commit bb15bf3aef
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
View File

@ -83,24 +83,24 @@ public class VBAMacroReader implements Closeable {
} }
private void openOOXML(InputStream zipFile) throws IOException { private void openOOXML(InputStream zipFile) throws IOException {
ZipInputStream zis = new ZipInputStream(zipFile); try(ZipInputStream zis = new ZipInputStream(zipFile)) {
ZipEntry zipEntry; ZipEntry zipEntry;
while ((zipEntry = zis.getNextEntry()) != null) { while ((zipEntry = zis.getNextEntry()) != null) {
if (endsWithIgnoreCase(zipEntry.getName(), VBA_PROJECT_OOXML)) { if (endsWithIgnoreCase(zipEntry.getName(), VBA_PROJECT_OOXML)) {
try { try {
// Make a NPOIFS from the contents, and close the stream // Make a NPOIFS from the contents, and close the stream
this.fs = new NPOIFSFileSystem(zis); this.fs = new NPOIFSFileSystem(zis);
return; return;
} catch (IOException e) { } catch (IOException e) {
// Tidy up // Tidy up
zis.close(); zis.close();
// Pass on // Pass on
throw e; throw e;
}
} }
} }
} }
zis.close();
throw new IllegalArgumentException("No VBA project found"); throw new IllegalArgumentException("No VBA project found");
} }