cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r702206 - /cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
Date Mon, 06 Oct 2008 17:13:33 GMT
Author: sergeyb
Date: Mon Oct  6 10:13:33 2008
New Revision: 702206

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

Modified:
    cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java

Modified: cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=702206&r1=702205&r2=702206&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
(original)
+++ cxf/branches/2.1.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
Mon Oct  6 10:13:33 2008
@@ -81,8 +81,10 @@
             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) {



Mime
View raw message