[Practicalxml-commits] SF.net SVN: practicalxml:[33] trunk/src/main/java/net/sf/practicalxml/ ParseUtil.java

[Auto-Generated S. C. M. <pra...@li...>]

Revision: 33
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=33&view=rev
Author:   kdgregory
Date:     2008-11-18 01:59:34 +0000 (Tue, 18 Nov 2008)

Log Message:
-----------
Fix bad check-in for XSD document builder helper
Remove singleton DocumentBuilderFactory instances -- was voodoo

Modified Paths:
--------------
    trunk/src/main/java/net/sf/practicalxml/ParseUtil.java

Modified: trunk/src/main/java/net/sf/practicalxml/ParseUtil.java
===================================================================
--- trunk/src/main/java/net/sf/practicalxml/ParseUtil.java	2008-11-18 01:51:39 UTC (rev 32)
+++ trunk/src/main/java/net/sf/practicalxml/ParseUtil.java	2008-11-18 01:59:34 UTC (rev 33)
@@ -158,29 +158,19 @@
 //  Internals
 //----------------------------------------------------------------------------
 
-    /** Singleton factory to create namespace-aware, non-validating parsers */
-    private static DocumentBuilderFactory _nvDbf;
-
-    /** Singleton factory to create namespace-aware, DTD-validating parsers */
-    private static DocumentBuilderFactory _dtdDbf;
-
-
     /**
      *  Returns a namespace-aware, non-validating parser.
      */
     private static synchronized DocumentBuilder newNVDocumentBuilder()
     {
-        if (_nvDbf == null)
-        {
-            _nvDbf = DocumentBuilderFactory.newInstance();
-            _nvDbf.setNamespaceAware(true);
-            _nvDbf.setValidating(false);
-            _nvDbf.setCoalescing(true);
-        }
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.setCoalescing(true);
+        dbf.setValidating(false);
 
         try
         {
-            return _nvDbf.newDocumentBuilder();
+            return dbf.newDocumentBuilder();
         }
         catch (ParserConfigurationException e)
         {
@@ -194,17 +184,14 @@
      */
     private static synchronized DocumentBuilder newDTDDocumentBuilder()
     {
-        if (_dtdDbf == null)
-        {
-            _dtdDbf = DocumentBuilderFactory.newInstance();
-            _dtdDbf.setNamespaceAware(true);
-            _dtdDbf.setValidating(true);
-            _dtdDbf.setCoalescing(true);
-        }
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.setValidating(true);
+        dbf.setCoalescing(true);
 
         try
         {
-            return _dtdDbf.newDocumentBuilder();
+            return dbf.newDocumentBuilder();
         }
         catch (ParserConfigurationException e)
         {
@@ -222,13 +209,13 @@
     {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
-        dbf.setValidating(false);
         dbf.setCoalescing(true);
+        dbf.setValidating(false);
         dbf.setSchema(schema);
 
         try
         {
-            return _dtdDbf.newDocumentBuilder();
+            return dbf.newDocumentBuilder();
         }
         catch (ParserConfigurationException e)
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.