Author: coheigea
Date: Fri Jul 4 16:23:29 2014
New Revision: 1607885
URL: http://svn.apache.org/r1607885
Log:
Fixing HTTPS policy assertion
Modified:
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
Modified:
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java?rev=1607885&r1=1607884&r2=1607885&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
(original)
+++
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
Fri Jul 4 16:23:29 2014
@@ -328,7 +328,8 @@ public class PolicyEnforcer implements S
} else if (abstractSecurityAssertion instanceof RelToken) {
assertableList.add(new
RelTokenAssertionState(abstractSecurityAssertion, !tokenRequired,
policyAsserter, initiator));
} else if (abstractSecurityAssertion instanceof HttpsToken) {
- assertableList.add(new
HttpsTokenAssertionState(abstractSecurityAssertion, !tokenRequired,
policyAsserter, initiator));
+ assertableList.add(new
HttpsTokenAssertionState(abstractSecurityAssertion,
+ !tokenRequired ||
initiator, policyAsserter, initiator));
} else if (abstractSecurityAssertion instanceof KeyValueToken) {
assertableList.add(new
KeyValueTokenAssertionState(abstractSecurityAssertion, !tokenRequired,
policyAsserter, initiator));
} else if (abstractSecurityAssertion instanceof AlgorithmSuite) {
