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/08/10 12:12:45 UTC

svn commit: r1156087 - /cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

Author: coheigea
Date: Wed Aug 10 10:12:45 2011
New Revision: 1156087

URL: http://svn.apache.org/viewvc?rev=1156087&view=rev
Log:
Always set the Message Level Principal on the WebServiceContext
 - The Message Level Principal should override any previous principal

Modified:
    cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1156087&r1=1156086&r2=1156087&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Wed Aug 10 10:12:45 2011
@@ -407,11 +407,7 @@ public class WSS4JInInterceptor extends 
                 if (!utWithCallbacks) {
                     WSS4JTokenConverter.convertToken(msg, p);
                 }
-                SecurityContext sc = msg.get(SecurityContext.class);
-                if (sc == null || sc.getUserPrincipal() == null) {
-                    msg.put(SecurityContext.class, createSecurityContext(p));
-                    break;
-                }
+                msg.put(SecurityContext.class, createSecurityContext(p));
             }            
         }
     }