Author: dkulp Date: Tue Feb 21 20:43:14 2012 New Revision: 1291994 URL: http://svn.apache.org/viewvc?rev=1291994&view=rev Log: Merged revisions 1291987 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1291987 | dkulp | 2012-02-21 15:24:32 -0500 (Tue, 21 Feb 2012) | 10 lines Merged revisions 1291968 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1291968 | dkulp | 2012-02-21 14:47:25 -0500 (Tue, 21 Feb 2012) | 2 lines [CXF-4124] Trap schemas embedded in WSDL and make sure the fallback handles it. ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1291994&r1=1291993&r2=1291994&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original) +++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Tue Feb 21 20:43:14 2012 @@ -504,6 +504,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 {
