You are viewing a plain text version of this content. The canonical link for it is here.

Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2009/03/14 19:23:22 UTC

svn commit: r754503 - /webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java

Author: veithen
Date: Sat Mar 14 18:23:22 2009
New Revision: 754503

URL: http://svn.apache.org/viewvc?rev=754503&view=rev
Log:
AXIS2-4271: In ADBXMLStreamReaderImpl, when delegating to the child reader, discard START_DOCUMENT events. This solves an issue where ADBXMLStreamReaderImpl generates START_DOCUMENT events in the middle of the document.

Modified:
    webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java

Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?rev=754503&r1=754502&r2=754503&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java Sat Mar 14 18:23:22 2009
@@ -1006,7 +1006,9 @@
         //we are done with the delegation
         //increment the property index
         currentPropertyIndex = currentPropertyIndex + 2;
-        return childReader.getEventType();
+        // If necessary, discard the START_DOCUMENT element (AXIS2-4271)
+        int eventType = childReader.getEventType();
+        return eventType == START_DOCUMENT ? childReader.next() : eventType;
     }
 
     /** are we done ? */