svn commit: r608995 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java

[dkulp]

Author: dkulp
Date: Fri Jan  4 12:45:59 2008
New Revision: 608995

URL: http://svn.apache.org/viewvc?rev=608995&view=rev
Log:
Merged revisions 608731 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r608731 | ffang | 2008-01-03 22:43:39 -0500 (Thu, 03 Jan 2008) | 1 line
  
  [CXF-1351] add checking for parent classloader of context class loader to 
avoid generating too much times parserFactory
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java?rev=608995&r1=608994&r2=608995&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java
 Fri Jan  4 12:45:59 2008
@@ -90,6 +90,8 @@
     public static DocumentBuilder getParser() throws 
ParserConfigurationException {
         if (parserFactory.getClass().getClassLoader() != null 
             && !parserFactory.getClass().getClassLoader().equals(
+                    
Thread.currentThread().getContextClassLoader().getParent())    
+            && !parserFactory.getClass().getClassLoader().equals(
                 Thread.currentThread().getContextClassLoader())) {
             //not the same classloader which init parserFactory, so create 
parserFactory with new classLoader
             parserFactory = DocumentBuilderFactory.newInstance();