From 338c70c2890ead0b059dac8adcafdbc798d68d1c Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 30 Nov 2013 19:17:03 -0500 Subject: [PATCH] fixed the loading of the suppression schema for validation during parsing Former-commit-id: 6107226d54e3e7821140de4c04675e9713997924 --- .../owasp/dependencycheck/suppression/SuppressionParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java index ac415dbe6..171d8d49e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java @@ -68,7 +68,7 @@ public class SuppressionParser { */ public List parseSuppressionRules(File file) throws SuppressionParseException { try { - final File schema = new File(this.getClass().getClassLoader().getResource("schema/suppression.xsd").getPath()); + final InputStream schemaStream = this.getClass().getClassLoader().getResourceAsStream("schema/suppression.xsd"); final SuppressionHandler handler = new SuppressionHandler(); final SAXParserFactory factory = SAXParserFactory.newInstance(); @@ -76,7 +76,7 @@ public class SuppressionParser { factory.setValidating(true); final SAXParser saxParser = factory.newSAXParser(); saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_LANGUAGE, SuppressionParser.W3C_XML_SCHEMA); - saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_SOURCE, schema); + saxParser.setProperty(SuppressionParser.JAXP_SCHEMA_SOURCE, new InputSource(schemaStream)); final XMLReader xmlReader = saxParser.getXMLReader(); xmlReader.setErrorHandler(new SuppressionErrorHandler()); xmlReader.setContentHandler(handler);