svn commit: r702205 - /cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java

[sergeyb]

Author: sergeyb
Date: Mon Oct  6 10:12:53 2008
New Revision: 702205

URL: http://svn.apache.org/viewvc?rev=702205&view=rev
Log:
Fixing a test failure (with help from Dan)

Modified:
    
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=702205&r1=702204&r2=702205&view=diff
==============================================================================
--- 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
(original)
+++ 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
Mon Oct  6 10:12:53 2008
@@ -82,10 +82,13 @@
             d.getDocumentElement().setAttribute("targetNamespace", ns);
         }
         
-        if (col.getSchemaByTargetNamespace(ns) != null) {
-            return col.getSchemaByTargetNamespace(ns);
+        SchemaInfo schemaInfo = serviceInfo.getSchema(ns);
+        if (schemaInfo != null && (systemId == null && 
schemaInfo.getSystemId() == null 
+            || systemId != null && 
schemaInfo.getSystemId().equalsIgnoreCase(systemId))) {
+            return schemaInfo.getSchema();
         }
         
+        
         if (hackAroundEmptyNamespaceIssue) {
             d = doEmptyNamespaceHack(d);            
         }