You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/08/04 10:38:42 UTC
svn commit: r1153783 - in /cxf/branches/2.4.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
Author: ningjiang
Date: Thu Aug 4 08:38:41 2011
New Revision: 1153783
URL: http://svn.apache.org/viewvc?rev=1153783&view=rev
Log:
Merged revisions 1153781 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1153781 | ningjiang | 2011-08-04 16:28:08 +0800 (Thu, 04 Aug 2011) | 1 line
CXF-3707 Fixes the issue of CXF WSDL generation
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1153781
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/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1153783&r1=1153782&r2=1153783&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Thu Aug 4 08:38:41 2011
@@ -307,7 +307,7 @@ public class JAXBDataBinding extends Abs
boolean schemasFromCache = false;
Collection<DOMSource> schemas = getSchemas();
- if (schemas == null) {
+ if (schemas == null || schemas.size() == 0) {
schemas = cachedContextAndSchemas.getSchemas();
if (schemas != null) {
schemasFromCache = true;