Repository: camel
Updated Branches:
  refs/heads/master 8afc5d175 -> 2e8f21dec


CAMEL-10894 Fixed test failure


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e8f21de
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e8f21de
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e8f21de

Branch: refs/heads/master
Commit: 2e8f21dec883b083ddcdddd802847b4c378a61a2
Parents: 8afc5d1
Author: Tomohisa Igarashi <[email protected]>
Authored: Sat Feb 25 16:59:31 2017 +0900
Committer: Tomohisa Igarashi <[email protected]>
Committed: Sat Feb 25 16:59:31 2017 +0900

----------------------------------------------------------------------
 .../java/org/apache/camel/processor/validation/SchemaReader.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2e8f21de/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaReader.java
----------------------------------------------------------------------
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
index 354acd4..c5a37a3 100644
--- 
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 @@ public class SchemaReader {
         if (getResourceResolver() != null) {
             factory.setResourceResolver(getResourceResolver());
         }  
-        if 
(!Boolean.parseBoolean(camelContext.getGlobalOptions().get(ACCESS_EXTERNAL_DTD)))
 {
+        if (camelContext != null && 
!Boolean.parseBoolean(camelContext.getGlobalOptions().get(ACCESS_EXTERNAL_DTD)))
 {
             try {
                 factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
             } catch (SAXException e) {

Reply via email to