Merge pull request #2663 from bstansberry/WFCORE-3115

[WFCORE-3115] Close the stream used to read the manifest
wildfly · Jul 27, 2017 · b29fa72 · b29fa72
2 parents 340f798 + 8ee8e34
commit b29fa72
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/version/src/main/java/org/jboss/as/version/ProductConfig.java b/version/src/main/java/org/jboss/as/version/ProductConfig.java
@@ -72,15 +72,16 @@ private ProductConfig(ModuleLoader loader, ProductConfProps productConfProps, Ma
         String productVersion = null;
         String consoleSlot = null;
 
+        InputStream manifestStream = null;
         try {
 
             if (productConfProps.productModuleId != null) {
                 Module module = loader.loadModule(productConfProps.productModuleId);
 
-                InputStream stream = module.getClassLoader().getResourceAsStream("META-INF/MANIFEST.MF");
+                manifestStream = module.getClassLoader().getResourceAsStream("META-INF/MANIFEST.MF");
                 Manifest manifest = null;
-                if (stream != null) {
-                    manifest = new Manifest(stream);
+                if (manifestStream != null) {
+                    manifest = new Manifest(manifestStream);
                 }
 
                 if (manifest != null) {
@@ -94,6 +95,8 @@ private ProductConfig(ModuleLoader loader, ProductConfProps productConfProps, Ma
             setSystemProperties(productConfProps.miscProperties, providedProperties);
         } catch (Exception e) {
             // Don't care
+        } finally {
+            safeClose(manifestStream);
         }
         isProduct = productName != null && !productName.isEmpty() && projectName == null;
         name = isProduct ? productName : projectName;