OpenJDK / jdk7u / jdk7u / jaxp
changeset 742:42be8e6266ab jdk7u51-b04
8025018: Enhance JAX-P set up
Reviewed-by: alanb, dfuchs, lancea, ahgross
| author | joehw |
|---|---|
| date | Tue, 22 Oct 2013 12:59:33 -0700 |
| parents | 1f0996368d6e |
| children | 0655a95d1609 |
| 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 Tue Oct 15 09:32:02 2013 -0700 +++ b/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java Tue Oct 22 12:59:33 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 Tue Oct 15 09:32:02 2013 -0700 +++ b/src/com/sun/org/apache/xalan/internal/lib/Extensions.java Tue Oct 22 12:59:33 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)