Mercurial > hg > release > icedtea7-forest-2.4 > jaxp
changeset 370:7d18bccaec37 jdk7u4-b13
Merge
author | lana |
---|---|
date | Sun, 19 Feb 2012 22:01:41 -0800 |
parents | 5dd2d5c3e4e4 (current diff) 02748cb7c0a0 (diff) |
children | c51876b27811 82c5b3166b31 |
files | |
diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);
--- 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; }