cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject cxf git commit: [CXF-6241]:Fix WS-RM doesn't work with WS-Security configured with @EndpointProperties
Date Fri, 06 Feb 2015 09:33:04 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes fdad7134e -> 4370435f6


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

Branch: refs/heads/3.0.x-fixes
Commit: 4370435f67c0f8b23eec223ee0f76c9b28649d1a
Parents: fdad713
Author: Jim Ma <ema@apache.org>
Authored: Fri Feb 6 17:16:23 2015 +0800
Committer: Jim Ma <ema@apache.org>
Committed: Fri Feb 6 17:25:35 2015 +0800

----------------------------------------------------------------------
 rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4370435f/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 2ef43c7..3146bac 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
@@ -454,7 +454,13 @@ public class RMEndpoint {
         ei.setProperty(SecurityConstants.TOKEN_STORE_CACHE_INSTANCE, tokenStore);
         
         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);
     }


Mime
View raw message