svn commit: r1442444 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java

[ruchithf]

Author: ruchithf
Date: Tue Feb  5 00:41:11 2013
New Revision: 1442444

URL: http://svn.apache.org/viewvc?rev=1442444&view=rev
Log:
Additional check and avoiding an NPE

Modified:
    
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1442444&r1=1442443&r2=1442444&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
 Tue Feb  5 00:41:11 2013
@@ -330,7 +330,8 @@ public class PolicyBasedResultsValidator
                 
                if(ut.isHashPassword() && !wssUt.isHashed()) {
                        throw new RampartException("invalidUsernameTokenType");
-                } else if 
(!wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT)) {
+                } else if (wssUt.getPassword() == null ||
+                       
!wssUt.getPasswordType().equals(WSConstants.PASSWORD_TEXT)) {
                        throw new RampartException("invalidUsernameTokenType");
                 }