You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/04/04 19:23:56 UTC
[1/3] cxf git commit: Use the wrapped reader if available
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) {
[2/3] cxf git commit: [CXF-6666] Make sure headers parsed via a
databinding can have the properties set
Posted by dk...@apache.org.
[CXF-6666] Make sure headers parsed via a databinding can have the properties set
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/902de733
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/902de733
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/902de733
Branch: refs/heads/3.1.x-fixes
Commit: 902de7334b81bbc68c006e36d911a34f4a498bb9
Parents: 149f1d5
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Apr 4 15:05:29 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Apr 4 15:23:52 2017 -0400
----------------------------------------------------------------------
.../cxf/binding/soap/interceptor/ReadHeadersInterceptor.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/902de733/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index 16e3310..1abbefd 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -53,6 +53,7 @@ import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.databinding.DataBinding;
+import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.headers.HeaderManager;
import org.apache.cxf.headers.HeaderProcessor;
import org.apache.cxf.helpers.DOMUtils;
@@ -254,7 +255,11 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
obj = hel;
} else {
dataBinding = p.getDataBinding();
- obj = dataBinding.createReader(Node.class).read(hel);
+ DataReader<Node> dataReader = dataBinding.createReader(Node.class);
+ dataReader.setAttachments(message.getAttachments());
+ dataReader.setProperty(DataReader.ENDPOINT, message.getExchange().getEndpoint());
+ dataReader.setProperty(Message.class.getName(), message);
+ obj = dataReader.read(hel);
}
// TODO - add the interceptors
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eb98654a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eb98654a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eb98654a
Branch: refs/heads/3.1.x-fixes
Commit: eb98654ac5a5711ad772039df58dce3ebb010328
Parents: 902de73
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Apr 4 15:23:52 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Apr 4 15:23:52 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/eb98654a/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 001925d..6fbafc1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -152,6 +152,7 @@ B 702389744199001e6c35e602ffb197ebaaf84838
B 707fa4f3c3f3aa40979e57468a9ac3eb3102a71f
B 73d1f886ae5265131e8664ee952ffd1cdc82f71a
B 741c9e349e7e48d3fe278ba8d8f17dd6bf4c4370
+B 7463f091dcf08fb4bbfe58c261dda6bd1900460c
B 746cd3c0b850702e5b3601d18ce81652a1f3441f
B 76d165c9f7d76de1e333eded6106fa0cc186131b
B 76edf9350e7640860b66196ad40396d54bbcb2b2