Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 56198 invoked from network); 22 Jul 2008 18:37:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Jul 2008 18:37:38 -0000 Received: (qmail 8764 invoked by uid 500); 22 Jul 2008 18:37:37 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 8723 invoked by uid 500); 22 Jul 2008 18:37:37 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 8714 invoked by uid 99); 22 Jul 2008 18:37:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jul 2008 11:37:37 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jul 2008 18:36:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8576D238896C; Tue, 22 Jul 2008 11:37:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r678854 - in /cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java Date: Tue, 22 Jul 2008 18:37:17 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080722183717.8576D238896C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }