svn commit: r646013 - /incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

[dkulp]

Author: dkulp
Date: Tue Apr  8 10:37:27 2008
New Revision: 646013

URL: http://svn.apache.org/viewvc?rev=646013&view=rev
Log:
If specific schemas are specified, make sure we use them (and don't cache them) 
instead of the jaxb created schemas


Modified:
    
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

Modified: 
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=646013&r1=646012&r2=646013&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 (original)
+++ 
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 Tue Apr  8 10:37:27 2008
@@ -322,9 +322,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>();