update for issue/pr #862

dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java

@@ -66,7 +66,6 @@ import org.owasp.dependencycheck.utils.H2DBLock;
 import static org.owasp.dependencycheck.analyzer.AnalysisPhase.*;
 //CSON: AvoidStarImport
 
-
 /**
  * Scans files, directories, etc. for Dependencies. Analyzers are loaded and
  * used to process the files found by the scan, if a file is encountered and an
@@ -661,8 +660,10 @@ public class Engine implements FileFilter, AutoCloseable {
                     initializeAnalyzer(analyzer);
                 } catch (InitializationException ex) {
                     exceptions.add(ex);
+                    if (ex.isFatal()) {
                         continue;
                     }
+                }
 
                 if (analyzer.isEnabled()) {
                     executeAnalysisTasks(analyzer, exceptions);
@@ -815,11 +816,13 @@ public class Engine implements FileFilter, AutoCloseable {
         } catch (InitializationException ex) {
             LOGGER.error("Exception occurred initializing {}.", analyzer.getName());
             LOGGER.debug("", ex);
+            if (ex.isFatal()) {
                 try {
                     analyzer.close();
                 } catch (Throwable ex1) {
                     LOGGER.trace("", ex1);
                 }
+            }
             throw ex;
         } catch (Throwable ex) {
             LOGGER.error("Unexpected exception occurred initializing {}.", analyzer.getName());

dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java

@@ -90,7 +90,7 @@ public abstract class AbstractSuppressionAnalyzer extends AbstractAnalyzer {
             try {
                 loadSuppressionData();
             } catch (SuppressionParseException ex) {
-                throw new InitializationException("Error initializing the suppression analyzer: " + ex.getLocalizedMessage(), ex);
+                throw new InitializationException("Error initializing the suppression analyzer: " + ex.getLocalizedMessage(), ex, true);
             }
         }
     }

dependency-check-core/src/main/java/org/owasp/dependencycheck/exception/InitializationException.java

@@ -31,6 +31,28 @@ public class InitializationException extends Exception {
      * The serial version uid.
      */
     private static final long serialVersionUID = 1L;
+    /**
+     * Whether or not the exception is fatal.
+     */
+    private boolean fatal = true;
+
+    /**
+     * Get the value of fatal
+     *
+     * @return the value of fatal
+     */
+    public boolean isFatal() {
+        return fatal;
+    }
+
+    /**
+     * Set the value of fatal
+     *
+     * @param fatal new value of fatal
+     */
+    public void setFatal(boolean fatal) {
+        this.fatal = fatal;
+    }
 
     /**
      * Creates a new InitializationException.
@@ -66,4 +88,16 @@ public class InitializationException extends Exception {
     public InitializationException(String msg, Throwable ex) {
         super(msg, ex);
     }
+
+    /**
+     * Creates a new InitializationException.
+     *
+     * @param msg a message for the exception.
+     * @param ex the cause of the exception.
+     * @param fatal whether or not the exception is fatal.
+     */
+    public InitializationException(String msg, Throwable ex, boolean fatal) {
+        super(msg, ex);
+        this.fatal = fatal;
+    }
 }