9:46 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2011-09-05 10:46:47 -0400 (Mon, 05 Sep 2011)
New Revision: 14938
Added:
legacy/tags/jbossws-1.2.1.GA_CP06-patch-02/jbossws-core/src/java/org/jboss/ws/core/utils/SecurityActions.java
Modified:
legacy/tags/jbossws-1.2.1.GA_CP06-patch-02/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
Log:
[JBPAPP-7127] Caching default document builder factory to improve performances
Modified:
legacy/tags/jbossws-1.2.1.GA_CP06-patch-02/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java
===================================================================
---
legacy/tags/jbossws-1.2.1.GA_CP06-patch-02/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2011-09-05
13:33:12 UTC (rev 14937)
+++
legacy/tags/jbossws-1.2.1.GA_CP06-patch-02/jbossws-core/src/java/org/jboss/ws/core/utils/DOMUtils.java 2011-09-05
14:46:47 UTC (rev 14938)
@@ -71,8 +71,28 @@
private static final String ENABLE_DOCTYPE_DECL =
"org.jboss.ws.enable_doctype_decl";
private static final String DISALLOW_DOCTYPE_DECL_FEATURE =
"http://apache.org/xml/features/disallow-doctype-decl";
+ private static DocumentBuilderFactory documentBuilderFactory;
+
private static final boolean enableDoctypeDeclaration =
Boolean.getBoolean(ENABLE_DOCTYPE_DECL);
+
+ static
+ {
+ //load default document builder factory using the DOMUtils' defining
classloader
+ final ClassLoader classLoader = SecurityActions.getContextClassLoader();
+ SecurityActions.setContextClassLoader(DOMUtils.class.getClassLoader());
+ try
+ {
+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ initializeFactory(factory);
+ documentBuilderFactory = factory;
+ }
+ finally
+ {
+ SecurityActions.setContextClassLoader(classLoader);
+ }
+ }
+
// All elements created by the same thread are created by the same builder and belong
to the same doc
private static ThreadLocal documentThreadLocal = new ThreadLocal();
private static ThreadLocal builderThreadLocal = new ThreadLocal() {
@@ -80,13 +100,21 @@
try
{
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setValidating(false);
- factory.setNamespaceAware(true);
- if (!enableDoctypeDeclaration)
+
+ //check if the factory we'd get for this thread is equivalent to the
default one;
+ //in that case re-use the default one and skip the initialization, which is
time-consuming
+ final DocumentBuilderFactory threadFactory ;
+ if (factory.getClass().getClassLoader() ==
documentBuilderFactory.getClass().getClassLoader())
{
- factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true);
+ threadFactory = documentBuilderFactory ;
}
- DocumentBuilder builder = factory.newDocumentBuilder();
+ else
+ {
+ threadFactory = factory ;
+ initializeFactory(threadFactory) ;
+ }
+
+ DocumentBuilder builder = threadFactory.newDocumentBuilder();
builder.setEntityResolver(new JBossWSEntityResolver());
return builder;
}
@@ -102,6 +130,24 @@
{
}
+ private static void initializeFactory(final DocumentBuilderFactory factory)
+ {
+ factory.setValidating(false);
+ factory.setNamespaceAware(true);
+
+ try
+ {
+ if (!enableDoctypeDeclaration)
+ {
+ factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true);
+ }
+ }
+ catch (ParserConfigurationException pce)
+ {
+ log.error(pce);
+ }
+ }
+
public static void clearThreadLocals()
{
documentThreadLocal.remove();
Added:
legacy/tags/jbossws-1.2.1.GA_CP06-patch-02/jbossws-core/src/java/org/jboss/ws/core/utils/SecurityActions.java
===================================================================
---
legacy/tags/jbossws-1.2.1.GA_CP06-patch-02/jbossws-core/src/java/org/jboss/ws/core/utils/SecurityActions.java
(rev 0)
+++
legacy/tags/jbossws-1.2.1.GA_CP06-patch-02/jbossws-core/src/java/org/jboss/ws/core/utils/SecurityActions.java 2011-09-05
14:46:47 UTC (rev 14938)
@@ -0,0 +1,135 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core.utils;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
+/**
+ * Security actions for this package
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 19-Jun-2009
+ *
+ */
+class SecurityActions
+{
+ /**
+ * Get context classloader.
+ *
+ * @return the current context classloader
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ else
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
{
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ }
+
+ /**
+ * Set context classloader.
+ *
+ * @param classLoader the context classloader
+ */
+ static void setContextClassLoader(final ClassLoader classLoader)
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ }
+ else
+ {
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run()
+ {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return null;
+ }
+ });
+ }
+ }
+
+ /**
+ * Load a class using the provided classloader
+ *
+ * @param name
+ * @return
+ * @throws PrivilegedActionException
+ */
+ static Class<?> loadClass(final ClassLoader cl, final String name) throws
PrivilegedActionException, ClassNotFoundException
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null)
+ {
+ return cl.loadClass(name);
+ }
+ else
+ {
+ return AccessController.doPrivileged(new
PrivilegedExceptionAction<Class<?>>() {
+ public Class<?> run() throws PrivilegedActionException
+ {
+ try
+ {
+ return cl.loadClass(name);
+ }
+ catch (Exception e)
+ {
+ throw new PrivilegedActionException(e);
+ }
+ }
+ });
+ }
+ }
+
+ /**
+ * Return the current value of the specified system property
+ *
+ * @param name
+ * @param defaultValue
+ * @return
+ */
+ static String getSystemProperty(final String name, final String defaultValue)
+ {
+ PrivilegedAction<String> action = new PrivilegedAction<String>()
+ {
+ public String run()
+ {
+ return System.getProperty(name, defaultValue);
+ }
+ };
+ return AccessController.doPrivileged(action);
+ }
+}
\ No newline at end of file