github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-14 15:53:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

update for issue/pr #862

Browse Source
This commit is contained in:
Jeremy Long
2017-10-13 05:58:56 -04:00
parent 79b7d74387
commit 20ff49f66c
3 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,7 +660,9 @@ public class Engine implements FileFilter, AutoCloseable {
initializeAnalyzer(analyzer);
} catch (InitializationException ex) {
exceptions.add(ex);
continue;
if (ex.isFatal()) {
continue;
}
}
if (analyzer.isEnabled()) {
@@ -815,10 +816,12 @@ public class Engine implements FileFilter, AutoCloseable {
} catch (InitializationException ex) {
LOGGER.error("Exception occurred initializing {}.", analyzer.getName());
LOGGER.debug("", ex);
try {
analyzer.close();
} catch (Throwable ex1) {
LOGGER.trace("", ex1);
if (ex.isFatal()) {
try {
analyzer.close();
} catch (Throwable ex1) {
LOGGER.trace("", ex1);
}
}
throw ex;
} catch (Throwable ex) {

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

@@ -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);
}
}
}

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

@@ -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;
}
}