[jbossws-commits] JBossWS SVN: r11498 - common/branches/jbossws-common-1.1.0.SP4/src/main/java/org/jboss/wsf/common.
Author: alessio.soldano(a)jboss.com
Date: 2010-01-28 04:25:15 -0500 (Thu, 28 Jan 2010)
New Revision: 11498
Modified:
common/branches/jbossws-common-1.1.0.SP4/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBPAPP-3571] JBossWS - Optimize EntityResolver setup in DOMUtils
Modified:
common/branches/jbossws-common-1.1.0.SP4/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
---
common/branches/jbossws-common-1.1.0.SP4/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-01-28
09:18:49 UTC (rev 11497)
+++
common/branches/jbossws-common-1.1.0.SP4/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-01-28
09:25:15 UTC (rev 11498)
@@ -49,6 +49,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -129,26 +130,33 @@
throw new RuntimeException("Unable to create document builder",
e);
}
}
-
+
private void setEntityResolver(DocumentBuilder builder)
{
- String[] resolvers = new String[] {
"org.jboss.ws.core.utils.JBossWSEntityResolver",
"org.jboss.util.xml.JBossEntityResolver" };
-
EntityResolver entityResolver = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- for (String resolver : resolvers)
+ try
{
- try
+ entityResolver = new JBossWSEntityResolver();
+ }
+ catch (Throwable t)
+ {
+ log.debug("Cannot load: " +
JBossWSEntityResolver.class.getCanonicalName());
+ String[] resolvers = new String[] {
"org.jboss.util.xml.JBossEntityResolver" };
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ for (String resolver : resolvers)
{
- Class<?> resolverClass = loader.loadClass(resolver);
- entityResolver = (EntityResolver)resolverClass.newInstance();
+ try
+ {
+ Class<?> resolverClass = loader.loadClass(resolver);
+ entityResolver = (EntityResolver)resolverClass.newInstance();
+ break;
+ }
+ catch (Exception ex)
+ {
+ log.debug("Cannot load: " + resolver);
+ }
}
- catch (Exception ex)
- {
- log.debug("Cannot load: " + resolver);
- }
}
-
if (entityResolver != null)
builder.setEntityResolver(entityResolver);
}