You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/11/04 19:13:36 UTC

svn commit: r832827 - in /cxf/branches/2.1.x-fixes: ./ rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java

Author: dkulp
Date: Wed Nov  4 18:13:36 2009
New Revision: 832827

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

................
  r831981 | dkulp | 2009-11-02 12:37:08 -0500 (Mon, 02 Nov 2009) | 9 lines
  
  Merged revisions 831979 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r831979 | dkulp | 2009-11-02 12:31:03 -0500 (Mon, 02 Nov 2009) | 1 line
    
    [CXF-2510] Add missing "return"
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java

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

Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java?rev=832827&r1=832826&r2=832827&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataWriterImpl.java Wed Nov  4 18:13:36 2009
@@ -132,6 +132,7 @@
                     } else {
                         throw new Fault("Invalid document type returned: " + dom.toString(), LOG);
                     }
+                    return;
                 }
                 
                 XMLStreamReader reader;