cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r929289 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/databinding/source/ rt/core/src/test/java/org/apache/cxf/interceptor/ rt/core/src/test/resources/org/apache/cxf/interceptor/resources/
Date Tue, 30 Mar 2010 21:12:19 GMT
Author: dkulp
Date: Tue Mar 30 21:12:19 2010
New Revision: 929289

URL: http://svn.apache.org/viewvc?rev=929289&view=rev
Log:
Merged revisions 929263 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r929263 | dkulp | 2010-03-30 16:36:02 -0400 (Tue, 30 Mar 2010) | 2 lines
  
  [CXF-2732] In source databinding, consume the END_ELEMENT event to match
  the other databindings
........

Added:
    cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
      - copied unchanged from r929263, cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/DocLiteralInInterceptorTest.java
    cxf/branches/2.2.x-fixes/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/multiPartDocLitBareReq.xml
      - copied unchanged from r929263, cxf/trunk/rt/core/src/test/resources/org/apache/cxf/interceptor/resources/multiPartDocLitBareReq.xml
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java

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

Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=929289&r1=929288&r2=929289&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Tue Mar 30 21:12:19 2010
@@ -213,6 +213,10 @@ public class XMLStreamDataReader impleme
                 return o;
             } else {
                 Document document = StaxUtils.read(reader);
+                if (reader.hasNext()) {
+                    //need to actually consume the END_ELEMENT
+                    reader.next();
+                }
                 return new DOMSource(document);
             }
         } catch (XMLStreamException e) {



Mime
View raw message