svn commit: r637747 - /webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java

[na...@apache.org]

Author: nandana
Date: Sun Mar 16 23:57:59 2008
New Revision: 637747

URL: http://svn.apache.org/viewvc?rev=637747&view=rev
Log:
Fixed some issues found by FindBugs

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

Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=637747&r1=637746&r2=637747&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java Sun Mar 16 23:57:59 2008
@@ -68,7 +68,7 @@
         
         //Check presence of timestamp
         WSSecurityEngineResult tsResult = null;
-        if(rpd.isIncludeTimestamp()) {
+        if(rpd != null &&  rpd.isIncludeTimestamp()) {
             tsResult = 
                 WSSecurityUtil.fetchActionResult(results, WSConstants.TS);
             if(tsResult == null) {
@@ -79,7 +79,7 @@
         
         //sig/encr
         Vector encryptedParts = RampartUtil.getEncryptedParts(rmd);
-        if(rpd.isSignatureProtection() && isSignatureRequired(rmd)) {
+        if(rpd != null && rpd.isSignatureProtection() && isSignatureRequired(rmd)) {
             encryptedParts.add(new WSEncryptionPart(WSConstants.SIG_LN, 
                     WSConstants.SIG_NS, "Element"));
         }
@@ -87,7 +87,7 @@
         Vector signatureParts = RampartUtil.getSignedParts(rmd);
 
         //Timestamp is not included in sig parts
-        if(rpd.isIncludeTimestamp() && !rpd.isTransportBinding()) {
+        if(rpd != null && rpd.isIncludeTimestamp() && !rpd.isTransportBinding()) {
             signatureParts.add(new WSEncryptionPart("timestamp"));
         }
         
@@ -394,7 +394,7 @@
                     .get(WSSecurityEngineResult.TAG_ACTION);
             int action = actInt.intValue();
             if(WSConstants.SIGN == action || WSConstants.ENCR == action) {
-                sigEncrActions.add(new Integer(action));
+                sigEncrActions.add(Integer.valueOf(action));
             }
             
         }