cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/2] cxf git commit: Use the wrapped reader if available
Date Tue, 04 Apr 2017 19:24:17 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 0e66c891d -> 2b56bf00a


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

Branch: refs/heads/3.0.x-fixes
Commit: efc45526d990744adc346956641f3264838c7cd5
Parents: 0e66c89
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Apr 4 14:02:46 2017 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Apr 4 15:24:10 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/efc45526/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 341d65e..8c9d88c 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
@@ -872,7 +872,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) {


Mime
View raw message