Use the wrapped reader if available
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4670bd24 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4670bd24 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4670bd24 Branch: refs/heads/master Commit: 4670bd247e10110e75a97bd3009f07b87e3d7d51 Parents: 7463f09 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Apr 4 14:02:46 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Apr 4 14:48:07 2017 -0400 ---------------------------------------------------------------------- .../jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4670bd24/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java index 9283ea1..7770526 100644 --- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java +++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java @@ -869,7 +869,7 @@ public final class JAXBEncoderDecoder { reader = findExtraNamespaces(reader); } obj = unmarshalWithClass ? u.unmarshal(reader, clazz) : u - .unmarshal((XMLStreamReader)source); + .unmarshal(reader); } else if (source instanceof XMLEventReader) { // allows the XML Event Reader to adjust it's behaviour based on the state of the unmarshaller if (source instanceof UnmarshallerAwareXMLReader) {
