You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/02/08 12:27:22 UTC

svn commit: r1068337 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java

Author: sergeyb
Date: Tue Feb  8 11:27:22 2011
New Revision: 1068337

URL: http://svn.apache.org/viewvc?rev=1068337&view=rev
Log:
Removingthe leftover code from UsernameTokenInterceptor

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java?rev=1068337&r1=1068336&r2=1068337&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java Tue Feb  8 11:27:22 2011
@@ -142,11 +142,6 @@ public class UsernameTokenInterceptor ex
                         assertUsernameTokens(message, princ);
                         message.put(WSS4JInInterceptor.PRINCIPAL_RESULT, princ);                   
                         
-                        boolean utWithCallbacks = !MessageUtils.getContextualBoolean(message, 
-                                 SecurityConstants.USERNAME_TOKEN_NO_CALLBACKS, false);
-                        if (!utWithCallbacks) {
-                            WSS4JTokenConverter.convertToken(message, princ);
-                        }
                         SecurityContext sc = message.get(SecurityContext.class);
                         if (sc == null || sc.getUserPrincipal() == null) {
                             Subject subject = createSubject(princ.getName(), princ.getPassword(),