From 0029d0e8b1e664fb47486bcf806270d492bf4e5e Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Tue, 10 Apr 2012 20:02:37 +0400 Subject: [PATCH] Fix incorrect closing of zip file. --- .../idea/maven/utils/MavenArtifactUtil.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenArtifactUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenArtifactUtil.java index a5870b0b9b9d..cba0ef493d4e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenArtifactUtil.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenArtifactUtil.java @@ -125,20 +125,24 @@ public class MavenArtifactUtil { if (!file.exists()) return null; ZipFile jar = new ZipFile(file); - ZipEntry entry = jar.getEntry(MAVEN_PLUGIN_DESCRIPTOR); - - if (entry == null) { - MavenLog.LOG.info(IndicesBundle.message("repository.plugin.corrupt", file)); - return null; - } - - InputStream is = jar.getInputStream(entry); try { - byte[] bytes = FileUtil.loadBytes(is); - return new MavenPluginInfo(bytes); + ZipEntry entry = jar.getEntry(MAVEN_PLUGIN_DESCRIPTOR); + + if (entry == null) { + MavenLog.LOG.info(IndicesBundle.message("repository.plugin.corrupt", file)); + return null; + } + + InputStream is = jar.getInputStream(entry); + try { + byte[] bytes = FileUtil.loadBytes(is); + return new MavenPluginInfo(bytes); + } + finally { + is.close(); + } } finally { - is.close(); jar.close(); } }