From eeb8d9cdf563806903c2413e6cfcd2969cbacf95 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 16 Mar 2014 07:02:10 -0400 Subject: [PATCH] fixed a bug that caused the suppression file not to load Former-commit-id: 3cc9ab64b4f9efbc51c497b82d9b63e2edd8376d --- .../analyzer/AbstractSuppressionAnalyzer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java index e614bf7c6..77500b041 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java @@ -119,17 +119,20 @@ public abstract class AbstractSuppressionAnalyzer extends AbstractAnalyzer { } catch (DownloadFailedException ex) { Downloader.fetchFile(url, file, true); } + } else { + file = new File(suppressionFilePath); } if (file != null) { final SuppressionParser parser = new SuppressionParser(); try { rules = parser.parseSuppressionRules(file); + Logger.getLogger(AbstractSuppressionAnalyzer.class.getName()).log(Level.FINE, rules.size() + " suppression rules were loaded."); } catch (SuppressionParseException ex) { final String msg = String.format("Unable to parse suppression xml file '%s'", file.getPath()); Logger.getLogger(AbstractSuppressionAnalyzer.class.getName()).log(Level.WARNING, msg); Logger.getLogger(AbstractSuppressionAnalyzer.class.getName()).log(Level.WARNING, ex.getMessage()); - Logger.getLogger(AbstractSuppressionAnalyzer.class.getName()).log(Level.FINE, null, ex); + Logger.getLogger(AbstractSuppressionAnalyzer.class.getName()).log(Level.FINE, "", ex); throw ex; } }