From 076ad8ef7e290a390201e1052bf6bb3943309bd4 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 21 Dec 2013 07:46:47 -0500 Subject: [PATCH] made error handling more robust so analysis should stop when something goes wrong with a signle jar Former-commit-id: 1e8fb3a5e6e904751c98a3621630f7953400e802 --- .../src/main/java/org/owasp/dependencycheck/Engine.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java index f6b9ecf40..e8c254214 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java @@ -336,6 +336,12 @@ public class Engine { a.analyze(d, this); } catch (AnalysisException ex) { d.addAnalysisException(ex); + } catch (Throwable ex) { + final String axMsg = String.format("An unexpected error occured during analysis of '%s'", d.getActualFilePath()); + AnalysisException ax = new AnalysisException(axMsg, ex); + d.addAnalysisException(ax); + Logger.getLogger(Engine.class.getName()).log(Level.SEVERE, axMsg); + Logger.getLogger(Engine.class.getName()).log(Level.FINE, axMsg, ex); } } }