Merged V2.9 to HEAD

9846: Merged V2.2 to V2.9
      9805: Merged V2.1 to V2.2
         9450: WCM - fix minor typo
         9456: Added direct QName child node handling test
         9462: ACT-759 - nested forks issue.
         9495: Lowered thread priority for index merge threads to default 5
         9534: Fixed ETWOONE-242: ContentMetadataExtracter can optionally ditch unextracted aspect-linked properties
         9559: Fixed SDK classpath
         9560: Fix ETWOONE-241
         9583: Fix for ETWOONE-250 (FacesContext null issue when authenticating via a ticket or guest auth)
         9592: (ALREADY ON HEAD)
         9709: Upgrade commons pool


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-09-01 10:29:50 +00:00
parent 0aa3dfcfc2
commit 740d12671c
3 changed files with 151 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -49,11 +49,8 @@ import org.xml.sax.SAXException;
*/
public class XMLUtil
{
private static final Log LOGGER = LogFactory.getLog(XMLUtil.class);
private static DocumentBuilder documentBuilder;
/** utility function for creating a document */
public static Document newDocument()
{
@@ -174,11 +171,7 @@ public class XMLUtil
/** provides a document builder that is namespace aware but not validating by default */
public static DocumentBuilder getDocumentBuilder()
{
if (XMLUtil.documentBuilder == null)
{
XMLUtil.documentBuilder = XMLUtil.getDocumentBuilder(true, false);
}
return XMLUtil.documentBuilder;
return XMLUtil.getDocumentBuilder(true, false);
}
/**