Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes b6d71af8b -> eb98654ac


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/149f1d58
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/149f1d58
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/149f1d58

Branch: refs/heads/3.1.x-fixes
Commit: 149f1d583e89a84931fc9601965f22ca6cd451d3
Parents: b6d71af
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 15:23:49 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/149f1d58/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 06252cb..05ca83c 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) {

Reply via email to