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 2010/05/27 18:43:03 UTC
svn commit: r948904 - in /cxf/branches/2.2.x-fixes: ./
common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
Author: dkulp
Date: Thu May 27 16:43:03 2010
New Revision: 948904
URL: http://svn.apache.org/viewvc?rev=948904&view=rev
Log:
Merged revisions 948876 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r948876 | dkulp | 2010-05-27 12:21:09 -0400 (Thu, 27 May 2010) | 2 lines
[CXF-2829] DOMStreamReader shouldn't generate attribute and namespace
events
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java?rev=948904&r1=948903&r2=948904&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java (original)
+++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java Thu May 27 16:43:03 2010
@@ -56,9 +56,6 @@ public abstract class AbstractDOMStreamR
boolean started;
boolean ended;
- int currentAttribute = -1;
- int currentNamespace = -1;
-
List<String> uris;
List<String> prefixes;
List<Object> attributes;
@@ -144,12 +141,6 @@ public abstract class AbstractDOMStreamR
if (!frame.started) {
frame.started = true;
currentEvent = frame.isDocument() ? START_DOCUMENT : START_ELEMENT;
- } else if (frame.currentAttribute < getAttributeCount() - 1) {
- frame.currentAttribute++;
- currentEvent = ATTRIBUTE;
- } else if (frame.currentNamespace < getNamespaceCount() - 1) {
- frame.currentNamespace++;
- currentEvent = NAMESPACE;
} else if (hasMoreChildren()) {
currentEvent = nextChild();