svn commit: r678854 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java

[dkulp]

Author: dkulp
Date: Tue Jul 22 11:37:16 2008
New Revision: 678854

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

........
  r678852 | dkulp | 2008-07-22 14:35:54 -0400 (Tue, 22 Jul 2008) | 2 lines
  
  [CXF-1578] Workaround bug in Jettison reader
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 22 11:37:16 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852

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

Modified: 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java?rev=678854&r1=678853&r2=678854&view=diff
==============================================================================
--- 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
 Tue Jul 22 11:37:16 2008
@@ -84,7 +84,12 @@
     }
 
     public String getElementText() throws XMLStreamException {
-        String ret = reader.getElementText(); 
+        String ret = reader.getElementText();
+        //workaround bugs in some readers that aren't properly advancing to 
+        //the END_ELEMNT (*cough*jettison*cough*)
+        while (reader.getEventType() != XMLStreamReader.END_ELEMENT) {
+            reader.next();
+        }
         depth--;
         return ret;
     }