svn commit: r1442397 - /axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml

2013-02-04 Thread veithen 
Author: veithen
Date: Mon Feb  4 22:08:24 2013
New Revision: 1442397

URL: http://svn.apache.org/viewvc?rev=1442397&view=rev
Log:
Small change to make JaCoCo work.

Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml

Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1442397&r1=1442396&r2=1442397&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Mon Feb  
4 22:08:24 2013
@@ -407,7 +407,7 @@
 maven-surefire-plugin
 
 
-
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar
+${argLine} 
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar
 
 org/apache/rahas/*.java

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

2013-02-04 Thread 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");
 }