Repository: cxf Updated Branches: refs/heads/2.7.x-fixes cfd1ae315 -> 2de364d58
[CXF-6241]:Fix WS-RM doesn't work with WS-Security configured with @EndpointProperties Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2de364d5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2de364d5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2de364d5 Branch: refs/heads/2.7.x-fixes Commit: 2de364d5895dded967873d58505479887ef648c9 Parents: cfd1ae3 Author: Jim Ma <[email protected]> Authored: Fri Feb 6 18:12:11 2015 +0800 Committer: Jim Ma <[email protected]> Committed: Fri Feb 6 18:12:11 2015 +0800 ---------------------------------------------------------------------- rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2de364d5/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java ---------------------------------------------------------------------- diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java index b4cff22..9d9a266 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java @@ -373,6 +373,13 @@ public class RMEndpoint { si.addEndpoint(ei); Endpoint endpoint = new WrappedEndpoint(applicationEndpoint, ei, service); + if (applicationEndpoint.getEndpointInfo() != null + && applicationEndpoint.getEndpointInfo().getProperties() != null) { + for (String key : applicationEndpoint.getEndpointInfo().getProperties().keySet()) { + endpoint.getEndpointInfo() + .setProperty(key, applicationEndpoint.getEndpointInfo().getProperty(key)); + } + } service.setEndpoint(endpoint); endpoints.put(protocol, endpoint); }
