github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-17 23:04:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug that caused the suppression file not to load

Browse Source 
Former-commit-id: 3cc9ab64b4f9efbc51c497b82d9b63e2edd8376d
This commit is contained in:
Jeremy Long
2014-03-16 07:02:10 -04:00
parent e8d7bbd280
commit eeb8d9cdf5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,17 +119,20 @@ public abstract class AbstractSuppressionAnalyzer extends AbstractAnalyzer {
} catch (DownloadFailedException ex) { } catch (DownloadFailedException ex) {
Downloader.fetchFile(url, file, true); Downloader.fetchFile(url, file, true);
} }
} else {
file = new File(suppressionFilePath);
} }
if (file != null) { if (file != null) {
final SuppressionParser parser = new SuppressionParser(); final SuppressionParser parser = new SuppressionParser();
try { try {
rules = parser.parseSuppressionRules(file); rules = parser.parseSuppressionRules(file);
Logger.getLogger(AbstractSuppressionAnalyzer.class.getName()).log(Level.FINE, rules.size() + " suppression rules were loaded.");
} catch (SuppressionParseException ex) { } catch (SuppressionParseException ex) {
final String msg = String.format("Unable to parse suppression xml file '%s'", file.getPath()); 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, msg);
Logger.getLogger(AbstractSuppressionAnalyzer.class.getName()).log(Level.WARNING, ex.getMessage()); 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; throw ex;
} }
} }