cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1153784 - in /cxf/branches/2.3.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
Date Thu, 04 Aug 2011 08:44:38 GMT
Author: ningjiang
Date: Thu Aug  4 08:44:37 2011
New Revision: 1153784

URL: http://svn.apache.org/viewvc?rev=1153784&view=rev
Log:
Merged revisions 1153783 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1153783 | ningjiang | 2011-08-04 16:38:41 +0800 (Thu, 04 Aug 2011) | 9 lines
  
  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.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  4 08:44:37 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1153362
-/cxf/trunk:1153258
+/cxf/branches/2.4.x-fixes:1153362,1153783
+/cxf/trunk:1153258,1153781

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1153784&r1=1153783&r2=1153784&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
Thu Aug  4 08:44:37 2011
@@ -361,7 +361,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;



Mime
View raw message