[jbossws-commits] JBossWS SVN: r9900 - common/trunk/src/main/java/org/jboss/wsf/common.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-04-28 05:51:24 -0400 (Tue, 28 Apr 2009)
New Revision: 9900

Modified:
   common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBWS-1582] refactoring

Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java	2009-04-28 09:42:30 UTC (rev 9899)
+++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java	2009-04-28 09:51:24 UTC (rev 9900)
@@ -78,24 +78,34 @@
    private static ThreadLocal<DocumentBuilder> builderThreadLocal = new ThreadLocal<DocumentBuilder>() {
       protected DocumentBuilder initialValue()
       {
+         DocumentBuilderFactory factory = null;
          try
          {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            factory = DocumentBuilderFactory.newInstance();
             factory.setValidating(false);
             factory.setNamespaceAware(true);
 
-            boolean disableDeferredNodeExpansion = Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION);
-            factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, !disableDeferredNodeExpansion);
-            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-            factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true);
+            try
+            {
+               factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+               factory.setFeature(DISALLOW_DOCTYPE_DECL_FEATURE, true);
+               if (Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION))
+               {
+                  factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
+               }
+            }
+            catch (ParserConfigurationException pce)
+            {
+               log.error(pce);
+            }
 
             DocumentBuilder builder = factory.newDocumentBuilder();
             setEntityResolver(builder);
             return builder;
          }
-         catch (ParserConfigurationException e)
+         catch (Exception e)
          {
-            log.error(e);
+            throw new RuntimeException("Unable to create document builder", e);
          }
       }