cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1291968 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Date Tue, 21 Feb 2012 19:47:25 GMT
Author: dkulp
Date: Tue Feb 21 19:47:25 2012
New Revision: 1291968

URL: http://svn.apache.org/viewvc?rev=1291968&view=rev
Log:
[CXF-4124] Trap schemas embedded in WSDL and make sure the fallback
handles it.

Modified:
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1291968&r1=1291967&r2=1291968&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
(original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Tue Feb 21 19:47:25 2012
@@ -506,6 +506,19 @@ public class DynamicClientFactory {
             if (key.startsWith("file:") || key.startsWith("jar:")) {
                 InputStream in = null;
                 try {
+                    if (key.contains("#")) {
+                        for (ServiceInfo si : serviceList) {
+                            for (SchemaInfo sci : si.getSchemas()) {
+                                if (key.equals(sci.getSystemId())) {
+                                    key = null;
+                                }
+                            }
+                        }
+                       
+                    }
+                    if (key == null) {
+                        continue;
+                    }
                     if (key.startsWith("file:")) {
                         in = new FileInputStream(new File(new URI(key)));
                     } else {



Mime
View raw message