Author: dkulp Date: Fri Mar 9 19:53:31 2012 New Revision: 1299009 URL: http://svn.apache.org/viewvc?rev=1299009&view=rev Log: Merged revisions 1299005 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1299005 | dkulp | 2012-03-09 14:50:05 -0500 (Fri, 09 Mar 2012) | 9 lines Merged revisions 1298999 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1298999 | dkulp | 2012-03-09 14:32:07 -0500 (Fri, 09 Mar 2012) | 2 lines [CXF-4163] Should not add xsd files with no namespace into JAXB ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1299009&r1=1299008&r2=1299009&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original) +++ cxf/branches/2.4.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Fri Mar 9 19:53:31 2012 @@ -590,7 +590,8 @@ public class JAXBDataBinding implements continue; } String key = schema.getSourceURI(); - if (ids.contains(key)) { + String tns = schema.getTargetNamespace(); + if (ids.contains(key) || tns == null) { continue; } if (key.startsWith("file:") || key.startsWith("jar:")) {
