# HG changeset patch
# User lana
# Date 1329717701 28800
# Node ID 7d18bccaec3781f3d4f2d71879f91e257db2f0f7
# Parent  5dd2d5c3e4e401da45ce71cb342172211c3e930b# Parent  02748cb7c0a05430863d65ad0d8c749f0bafed98
Merge

diff -r 5dd2d5c3e4e4 -r 7d18bccaec37 src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java	Fri Feb 17 09:47:17 2012 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java	Sun Feb 19 22:01:41 2012 -0800
@@ -448,7 +448,9 @@
             return;
         }
         else if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
-            _useServicesMechanism = value;
+            //in secure mode, let _useServicesMechanism be determined by the constructor
+            if (!_isSecureMode)
+                _useServicesMechanism = value;
         }
         else {
             // unknown feature
diff -r 5dd2d5c3e4e4 -r 7d18bccaec37 src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Fri Feb 17 09:47:17 2012 -0800
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Sun Feb 19 22:01:41 2012 -0800
@@ -351,6 +351,10 @@
             fSecurityManager = value ? new SecurityManager() : null;
             fXMLSchemaLoader.setProperty(SECURITY_MANAGER, fSecurityManager);
             return;
+        } else if (name.equals(Constants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
+            //in secure mode, let _useServicesMechanism be determined by the constructor
+            if (System.getSecurityManager() != null)
+                return;
         }
         try {
             fXMLSchemaLoader.setFeature(name, value);
diff -r 5dd2d5c3e4e4 -r 7d18bccaec37 src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
--- a/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java	Fri Feb 17 09:47:17 2012 -0800
+++ b/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java	Sun Feb 19 22:01:41 2012 -0800
@@ -186,7 +186,9 @@
                 return;
             }
             if (name.equals(XalanConstants.ORACLE_FEATURE_SERVICE_MECHANISM)) {
-                _useServicesMechanism = value;
+                //in secure mode, let _useServicesMechanism be determined by the constructor
+                if (!_isSecureMode)
+                    _useServicesMechanism = value;
                 return;
             }