From f312a4e30d16f7cd66d778c6364f0761f77c194d Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Tue, 30 Jun 2015 23:59:45 -0400 Subject: [PATCH] cleanup uwe's unzip code --- .../org/elasticsearch/plugins/PluginManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginManager.java b/core/src/main/java/org/elasticsearch/plugins/PluginManager.java index 9413e05df16..9b28a16b978 100644 --- a/core/src/main/java/org/elasticsearch/plugins/PluginManager.java +++ b/core/src/main/java/org/elasticsearch/plugins/PluginManager.java @@ -313,13 +313,13 @@ public class PluginManager { // be on the safe side: do not rely on that directories are always extracted // before their children (although this makes sense, but is it guaranteed?) Files.createDirectories(targetFile.getParent()); - if (!entry.isDirectory()) { - OutputStream out = Files.newOutputStream(targetFile); - int len; - while((len = zipInput.read(buffer)) >= 0) { - out.write(buffer, 0, len); + if (entry.isDirectory() == false) { + try (OutputStream out = Files.newOutputStream(targetFile)) { + int len; + while((len = zipInput.read(buffer)) >= 0) { + out.write(buffer, 0, len); + } } - out.close(); } zipInput.closeEntry(); }