github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-18 09:37:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
Jeremy Long
2017-04-12 10:42:02 -04:00
parent c622ff2b19 afa47f7dfc
commit c9ee55863f
28 changed files with 278 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java
View File

@@ -282,9 +282,15 @@ public class App {
exCol = ex;
}
final List<Dependency> dependencies = engine.getDependencies();
final CveDB cve = CveDB.getInstance();
final DatabaseProperties prop = cve.getDatabaseProperties();
DatabaseProperties prop = null;
try (CveDB cve = CveDB.getInstance()) {
prop = cve.getDatabaseProperties();
} catch (DatabaseException ex) {
//TODO shouldn't this be a fatal exception
LOGGER.debug("Unable to retrieve DB Properties", ex);
}
final ReportGenerator report = new ReportGenerator(applicationName, dependencies, engine.getAnalyzers(), prop);
try {
report.generateReports(reportDirectory, outputFormat);
} catch (ReportException ex) {