JBoss Portal SVN: r10885 - modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-01 11:03:26 -0400 (Sun, 01 Jun 2008)
New Revision: 10885
Modified:
modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml/XMLTools.java
Log:
make the xml factories accessor to return a newly created factory because factories are stateful
Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml/XMLTools.java
===================================================================
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml/XMLTools.java 2008-05-31 22:26:16 UTC (rev 10884)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml/XMLTools.java 2008-06-01 15:03:26 UTC (rev 10885)
@@ -62,12 +62,6 @@
/** Namespace URI for XML lang. */
public static final String XML_LANG_NAMESPACE_URI = "http://www.w3.org/XML/1998/namespace";
- /** Document builder factory. */
- private static final DocumentBuilderFactory buildFactory = DocumentBuilderFactory.newInstance();
-
- /** Transformer factory. */
- private static final TransformerFactory transformerFactory = TransformerFactory.newInstance();
-
/** Default output format which is : no xml declaration, no document type, indent. */
private static Properties DEFAULT_FORMAT = createFormat(true, false, true, "utf-8");
@@ -112,7 +106,7 @@
/** Return the builder factory. */
public static DocumentBuilderFactory getDocumentBuilderFactory()
{
- return buildFactory;
+ return DocumentBuilderFactory.newInstance();
}
/**
@@ -156,7 +150,7 @@
/** Converts an element to a String representation. */
private static String toString(Element element, Properties properties) throws ParserConfigurationException, TransformerException
{
- Document doc = buildFactory.newDocumentBuilder().newDocument();
+ Document doc = getDocumentBuilderFactory().newDocumentBuilder().newDocument();
element = (Element)doc.importNode(element, true);
doc.appendChild(element);
return toString(doc, properties);
@@ -165,7 +159,7 @@
/** Converts an document to a String representation. */
private static String toString(Document doc, Properties format) throws TransformerException
{
- Transformer transformer = transformerFactory.newTransformer();
+ Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperties(format);
StringWriter writer = new StringWriter();
Source source = new DOMSource(doc);
@@ -177,7 +171,7 @@
/** Parse a string into a document. */
public static Document toDocument(String text) throws ParserConfigurationException, SAXException, IOException
{
- DocumentBuilder builder = buildFactory.newDocumentBuilder();
+ DocumentBuilder builder = getDocumentBuilderFactory().newDocumentBuilder();
StringReader reader = new StringReader(text);
InputSource source = new InputSource();
source.setCharacterStream(reader);
@@ -199,7 +193,7 @@
}
//
- Document doc = buildFactory.newDocumentBuilder().newDocument();
+ Document doc = getDocumentBuilderFactory().newDocumentBuilder().newDocument();
element = (Element)doc.importNode(element, true);
doc.appendChild(element);
return doc;
15 years, 11 months