commit 0033a8e3b6157fd42af73dcbc08becaa7b786528
author Aleksei Efimov <aefimov@openjdk.org> Tue Jul 22 09:21:23 2014 +0400
committer Aleksei Efimov <aefimov@openjdk.org> Tue Jul 22 09:21:23 2014 +0400
tree 3041f3b8b5ae980cb7e15e19947cb9c79053592f
parent 956e0a7749055c26e0c41306749a2b80e3d3d025

8049514: FEATURE_SECURE_PROCESSING can not be turned off on a validator through SchemaFactory

Reviewed-by: lancea

jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java

diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
index f2dadd0..4e57170 100644
--- a/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
+++ b/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
@@ -453,7 +453,8 @@
     }
 
     private void propagateFeatures(AbstractXMLSchema schema) {
-        schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, fSecurityManager != null);
+        schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+                (fSecurityManager != null && fSecurityManager.isSecureProcessing()));
         schema.setFeature(Constants.ORACLE_FEATURE_SERVICE_MECHANISM, fUseServicesMechanism);
         String[] features = fXMLSchemaLoader.getRecognizedFeatures();
         for (int i = 0; i < features.length; ++i) {