Return-Path: 
 <commits-return-11623-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 39604 invoked from network); 27 May 2010 16:43:24 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 27 May 2010 16:43:24 -0000
Received: (qmail 57993 invoked by uid 500); 27 May 2010 16:43:24 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 57896 invoked by uid 500); 27 May 2010 16:43:24 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 57883 invoked by uid 99); 27 May 2010 16:43:24 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 May 2010 16:43:24 +0000
X-ASF-Spam-Status: No, hits=-1291.9 required=10.0
	tests=ALL_TRUSTED,AWL
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; Thu, 27 May 2010 16:43:23 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 85D9323889F1; Thu, 27 May 2010 16:43:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r948904 - in /cxf/branches/2.2.x-fixes: ./
 common/common/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
Date: Thu, 27 May 2010 16:43:03 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100527164303.85D9323889F1@eris.apache.org>

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();