Mercurial > hg > release > icedtea7-forest-2.2 > jaxp
changeset 368:341a97befe0f
7143711: Feature added by 7053556 should not override what's set by the constructor in secure mode
Reviewed-by: hawtin
author | joehw |
---|---|
date | Tue, 14 Feb 2012 09:25:59 -0800 |
parents | 3fbd87d50fbf |
children | 02748cb7c0a0 |
files | src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java |
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 Mon Feb 06 17:11:10 2012 -0800 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Tue Feb 14 09:25:59 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 Mon Feb 06 17:11:10 2012 -0800 +++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Tue Feb 14 09:25:59 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 Mon Feb 06 17:11:10 2012 -0800 +++ b/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java Tue Feb 14 09:25:59 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; }