From a55710df7b99046e8fca7585ec2dfcb30248f7d3 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 1 Mar 2014 06:56:42 -0500
Subject: [PATCH] refactored closing input streams

Former-commit-id: 5cb4c326cc8030ff6b776fcc20a6d790494aee43
---
 .../dependencycheck/analyzer/JarAnalyzer.java | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
index e48a28978..5f0816dd1 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
@@ -393,11 +393,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
         } catch (IOException ex) {
             Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, null, ex);
         } finally {
-            try {
-                input.close();
-            } catch (IOException ex) {
-                Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, null, ex);
-            }
+            closeStream(input);
         }
         Model model = null;
         FileInputStream fis = null;
@@ -423,17 +419,26 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
             Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINE, null, ex);
             throw ex;
         } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException ex) {
-                    Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINEST, null, ex);
-                }
-            }
+            closeStream(fis);
         }
         return model;
     }
 
+    /**
+     * Silently closes an input stream ignoring errors.
+     *
+     * @param stream an input stream to close
+     */
+    private void closeStream(InputStream stream) {
+        if (stream != null) {
+            try {
+                stream.close();
+            } catch (IOException ex) {
+                Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINEST, null, ex);
+            }
+        }
+    }
+
     /**
      * Retrieves the specified POM from a jar file and converts it to a Model.
      *