You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/05/14 15:25:21 UTC

svn commit: r1338192 - /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/UsernameToken.java

Author: coheigea
Date: Mon May 14 13:25:20 2012
New Revision: 1338192

URL: http://svn.apache.org/viewvc?rev=1338192&view=rev
Log:
Fix for possible NPE

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/UsernameToken.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/UsernameToken.java?rev=1338192&r1=1338191&r2=1338192&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/UsernameToken.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/UsernameToken.java Mon May 14 13:25:20 2012
@@ -511,6 +511,11 @@ public class UsernameToken {
                 getName(), getPassword(), getPasswordType(), 
                 WSPasswordCallback.USERNAME_TOKEN, data
             );
+        
+        if (data.getCallbackHandler() == null) {
+            LOG.debug("CallbackHandler is null");
+            throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+        }
         try {
             data.getCallbackHandler().handle(new Callback[]{pwCb});
         } catch (IOException e) {