[2/3] cxf git commit: [CXF-6666] Make sure headers parsed via a databinding can have the properties set

2017-04-04 Thread dkulp 
[CXF-] 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 
Authored: Tue Apr 4 15:05:29 2017 -0400
Committer: Daniel Kulp 
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 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

cxf git commit: [CXF-6666] Make sure headers parsed via a databinding can have the properties set

2017-04-04 Thread dkulp 
Repository: cxf
Updated Branches:
  refs/heads/master 4670bd247 -> 037b0ee94


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

Branch: refs/heads/master
Commit: 037b0ee94078cbfad94ac42856985f77c450ea4a
Parents: 4670bd2
Author: Daniel Kulp 
Authored: Tue Apr 4 15:05:29 2017 -0400
Committer: Daniel Kulp 
Committed: Tue Apr 4 15:05:29 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/037b0ee9/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 d016ee9..bce0bf7 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 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