Author: dkulp
Date: Fri Jan 4 13:22:42 2008
New Revision: 609014
URL: http://svn.apache.org/viewvc?rev=609014&view=rev
Log:
Merged revisions 609006 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r609006 | bimargulies | 2008-01-04 16:08:15 -0500 (Fri, 04 Jan 2008) | 2 lines
Try this again without skipping valid tags.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=609014&r1=609013&r2=609014&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Fri Jan 4 13:22:42 2008
@@ -52,6 +52,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -643,7 +644,10 @@
obj = ((JAXBElement)obj).getValue();
}
ret.add(obj);
- reader.nextTag();
+ while (reader.getEventType() !=
XMLStreamConstants.START_ELEMENT
+ && reader.getEventType() !=
XMLStreamConstants.END_ELEMENT) {
+ reader.nextTag();
+ }
}
return ret;
} catch (Fault ex) {
