svn commit: r1448621 - /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java

[coheigea]

Author: coheigea
Date: Thu Feb 21 12:15:22 2013
New Revision: 1448621

URL: http://svn.apache.org/r1448621
Log:
[WSS-420] - Minor fix

Modified:
    
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java

Modified: 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java?rev=1448621&r1=1448620&r2=1448621&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java
 (original)
+++ 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java
 Thu Feb 21 12:15:22 2013
@@ -220,7 +220,7 @@ public class UsernameTokenValidator impl
             allowUsernameTokenDerivedKeys = 
wssConfig.isAllowUsernameTokenNoPassword();
         }
         
-        if (!(allowUsernameTokenDerivedKeys || 
usernameToken.containsPasswordElement())) {
+        if (!allowUsernameTokenDerivedKeys) {
             if (log.isDebugEnabled()) {
                 log.debug("Authentication failed as the received UsernameToken 
does not "
                     + "contain any password element");