You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by co...@apache.org on 2011/10/14 18:05:27 UTC

svn commit: r1183402 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java

Author: coheigea
Date: Fri Oct 14 16:05:26 2011
New Revision: 1183402

URL: http://svn.apache.org/viewvc?rev=1183402&view=rev
Log:
Prevent existing entries in the STSClient context from being overwritten by mapSecurityProps

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=1183402&r1=1183401&r2=1183402&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java Fri Oct 14 16:05:26 2011
@@ -115,7 +115,7 @@ public class IssuedTokenInterceptorProvi
                 if (v == null) {
                     v = message.getContextualProperty(s);
                 }
-                if (v != null) {
+                if (!ctx.containsKey(s) && v != null) {
                     ctx.put(s, v);
                 }
             }