Mercurial > hg > openjdk > jdk8 > jaxp
changeset 561:10b3a127b1fc
8025018: Enhance JAX-P set up
Reviewed-by: alanb, dfuchs, lancea, ahgross
author | joehw |
---|---|
date | Tue, 22 Oct 2013 13:15:50 -0700 |
parents | 54a0dd196acd |
children | ef71f2353352 |
files | src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java src/com/sun/org/apache/xalan/internal/lib/Extensions.java |
diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java Mon Oct 21 14:27:39 2013 +0100 +++ b/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java Tue Oct 22 13:15:50 2013 -0700 @@ -52,6 +52,8 @@ */ public class ExsltStrings extends ExsltBase { + static final String JDK_DEFAULT_DOM = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"; + /** * The str:align function aligns a string within another string. * <p> @@ -343,7 +345,11 @@ static { try { - m_doc =DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); + if (System.getSecurityManager() == null) { + m_doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); + } else { + m_doc = DocumentBuilderFactory.newInstance(JDK_DEFAULT_DOM, null).newDocumentBuilder().newDocument(); + } } catch(ParserConfigurationException pce)
--- a/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Mon Oct 21 14:27:39 2013 +0100 +++ b/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Tue Oct 22 13:15:50 2013 -0700 @@ -56,6 +56,7 @@ */ public class Extensions { + static final String JDK_DEFAULT_DOM = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"; /** * Constructor Extensions * @@ -407,7 +408,11 @@ { try { - m_doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); + if (System.getSecurityManager() == null) { + m_doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); + } else { + m_doc = DocumentBuilderFactory.newInstance(JDK_DEFAULT_DOM, null).newDocumentBuilder().newDocument(); + } } catch(ParserConfigurationException pce)