CAMEL-10894: Improve test fix

stsiano · stsiano · commit ec3d0db81ba0 · 2017-02-27T08:04:59.000+01:00
diff --git a/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java b/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java
@@ -173,7 +173,7 @@ protected SchemaFactory createSchemaFactory() {
         if (getResourceResolver() != null) {
             factory.setResourceResolver(getResourceResolver());
         }  
-        if (camelContext != null && !Boolean.parseBoolean(camelContext.getProperty(ACCESS_EXTERNAL_DTD))) {
+        if (camelContext == null || !Boolean.parseBoolean(camelContext.getProperty(ACCESS_EXTERNAL_DTD))) {
             try {
                 factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
             } catch (SAXException e) {

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ protected SchemaFactory createSchemaFactory() {`
`173`	`173`	`if (getResourceResolver() != null) {`
`174`	`174`	`factory.setResourceResolver(getResourceResolver());`
`175`	`175`	`}`
`176`		`- if (camelContext != null && !Boolean.parseBoolean(camelContext.getProperty(ACCESS_EXTERNAL_DTD))) {`
	`176`	`+ if (camelContext == null \|\| !Boolean.parseBoolean(camelContext.getProperty(ACCESS_EXTERNAL_DTD))) {`
`177`	`177`	`try {`
`178`	`178`	`factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");`
`179`	`179`	`} catch (SAXException e) {`