Author: ruchithf
Date: Mon Nov 5 22:22:23 2007
New Revision: 592299
URL: http://svn.apache.org/viewvc?rev=592299&view=rev
Log:
Applied patch in RAMPART-102
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=592299&r1=592298&r2=592299&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
Mon Nov 5 22:22:23 2007
@@ -287,8 +287,28 @@
//There are no results to COMPARE
return;
}
+
+ boolean sigNotPresent = true;
+ boolean encrNotPresent = true;
+
+ for (Iterator iter = sigEncrActions.iterator(); iter.hasNext();) {
+ Integer act = (Integer) iter.next();
+ if(act.intValue() == WSConstants.SIGN) {
+ sigNotPresent = false;
+ } else if(act.intValue() == WSConstants.ENCR) {
+ encrNotPresent = false;
+ }
+ }
+
+ // Only one action is present, so there is no order to check
+ if ( sigNotPresent || encrNotPresent ) {
+ return;
+ }
+
+
boolean done = false;
if(Constants.SIGN_BEFORE_ENCRYPTING.equals(protectionOrder)) {
+
boolean sigFound = false;
for (Iterator iter = sigEncrActions.iterator();
iter.hasNext() || !done;) {
