svn commit: r652141 - in /cxf/branches/2.0.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

[dkulp]

Author: dkulp
Date: Tue Apr 29 14:22:12 2008
New Revision: 652141

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

........
  r652127 | dkulp | 2008-04-29 17:10:44 -0400 (Tue, 29 Apr 2008) | 3 lines
  
  [CXF-1553] Fix problem of not setting namespace aware for all Stax parsers
  Fix an issue with the ObjectFactory cache not actually working correctly
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
    
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

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

Modified: 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java?rev=652141&r1=652140&r2=652141&view=diff
==============================================================================
--- 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
 Tue Apr 29 14:22:12 2008
@@ -74,6 +74,7 @@
         }
 
         try {
+            
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespaces";, true); 
             
nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes";,
 
                                            true);
         } catch (Exception e) {

Modified: 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=652141&r1=652140&r2=652141&view=diff
==============================================================================
--- 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 Tue Apr 29 14:22:12 2008
@@ -442,6 +442,8 @@
                         OBJECT_FACTORY_CACHE.put(objectFactoryClassName, 
                                                  new CachedClassOrNull(null));
                     }
+                } else {
+                    objectFactories.add(ofactory);                    
                 }
             }
         }