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

[nandana]

Author: nandana
Date: Fri Dec 14 05:32:18 2007
New Revision: 604188

URL: http://svn.apache.org/viewvc?rev=604188&view=rev
Log:
fixed issue https://issues.apache.org/jira/browse/RAMPART-114.

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=604188&r1=604187&r2=604188&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
 Fri Dec 14 05:32:18 2007
@@ -86,6 +86,7 @@
         }
         
         if(!rmd.isInitiator()) {
+                        
             //Just an indicator for EndorsingSupportingToken signature
             SupportingToken endSupportingToken = 
rpd.getEndorsingSupportingTokens();
             if(endSupportingToken !=  null) {
@@ -204,7 +205,14 @@
             }
         }
         
-        if(sig && signatureParts.size() == 0) {
+        RampartPolicyData rpd = data.getRampartMessageData().getPolicyData();
+        
+        SupportingToken sgndSupTokens = rpd.getSignedSupportingTokens();
+        SupportingToken sgndEndorSupTokens = 
rpd.getSignedEndorsingSupportingTokens();
+        
+        if(sig && signatureParts.size() == 0 
+                && sgndSupTokens.getTokens().size() == 0
+                 && sgndEndorSupTokens.getTokens().size() == 0) {
             
             //Unexpected signature
             throw new RampartException("unexprectedSignature");