svn commit: r646011 - /incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

[dkulp]

Author: dkulp
Date: Tue Apr  8 10:32:21 2008
New Revision: 646011

URL: http://svn.apache.org/viewvc?rev=646011&view=rev
Log:
Fix a random build failure that was poping up on various test machines in IONA 
on 2.0.x
If specific schemas are specified, make sure we use them (and don't cache them) 
instead of the jaxb created schemas

Modified:
    
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

Modified: 
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=646011&r1=646010&r2=646011&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 Tue Apr  8 10:32:21 2008
@@ -303,9 +303,14 @@
             }
 
             boolean schemasFromCache = false;
-            Collection<DOMSource> schemas = 
cachedContextAndSchemas.getSchemas();
+            Collection<DOMSource> schemas = getSchemas();
             if (schemas == null) {
-                schemas = getSchemas();
+                schemas = cachedContextAndSchemas.getSchemas();
+                if (schemas != null) {
+                    schemasFromCache = true;
+                }
+            } else {
+                schemasFromCache = true;
             }
             if (schemas == null) {
                 schemas = new HashSet<DOMSource>();