axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r754507 - in /webservices/axis2/branches/java/1_5: ./ modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
Date Sat, 14 Mar 2009 19:13:50 GMT
Author: veithen
Date: Sat Mar 14 19:13:49 2009
New Revision: 754507

URL: http://svn.apache.org/viewvc?rev=754507&view=rev
Log:
AXIS2-4271: Merged r754503 to 1.5 branch.

Modified:
    webservices/axis2/branches/java/1_5/   (props changed)
    webservices/axis2/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java

Propchange: webservices/axis2/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 14 19:13:49 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467,754503

Modified: webservices/axis2/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?rev=754507&r1=754506&r2=754507&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
(original)
+++ webservices/axis2/branches/java/1_5/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
Sat Mar 14 19:13:49 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 ? */



Mime
View raw message