Close streams when reading the manifest

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
eclipse-vertx · Oct 1, 2015 · 85ea227 · 85ea227
1 parent adab820
commit 85ea227
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/java/io/vertx/core/impl/launcher/VertxCommandLauncher.java b/src/main/java/io/vertx/core/impl/launcher/VertxCommandLauncher.java
@@ -24,6 +24,7 @@
 import io.vertx.core.spi.launcher.ExecutionContext;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintStream;
 import java.net.URL;
 import java.util.*;
@@ -384,15 +385,18 @@ protected String getDefaultCommand() {
     try {
       Enumeration<URL> resources = RunCommand.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
       while (resources.hasMoreElements()) {
-        Manifest manifest = new Manifest(resources.nextElement().openStream());
+        InputStream stream = resources.nextElement().openStream();
+        Manifest manifest = new Manifest(stream);
         Attributes attributes = manifest.getMainAttributes();
         String mainClass = attributes.getValue("Main-Class");
         if (main.getClass().getName().equals(mainClass)) {
           String command = attributes.getValue("Main-Command");
           if (command != null) {
+            stream.close();
             return command;
           }
         }
+        stream.close();
       }
     } catch (IOException e) {
       throw new IllegalStateException(e.getMessage());
@@ -414,15 +418,18 @@ protected String getMainVerticle() {
     try {
       Enumeration<URL> resources = RunCommand.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
       while (resources.hasMoreElements()) {
-        Manifest manifest = new Manifest(resources.nextElement().openStream());
+        InputStream stream = resources.nextElement().openStream();
+        Manifest manifest = new Manifest(stream);
         Attributes attributes = manifest.getMainAttributes();
         String mainClass = attributes.getValue("Main-Class");
         if (main != null && main.getClass().getName().equals(mainClass)) {
           String theMainVerticle = attributes.getValue("Main-Verticle");
           if (theMainVerticle != null) {
+            stream.close();
             return theMainVerticle;
           }
         }
+        stream.close();
       }
     } catch (IOException e) {
       throw new IllegalStateException(e.getMessage());