Author: giger
Date: Sat Mar 10 18:47:50 2012
New Revision: 1299252
URL: http://svn.apache.org/viewvc?rev=1299252&view=rev
Log:
The parent assertion for the main signature / encryption token can also be of
type ProtectionToken
Modified:
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java
Modified:
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java?rev=1299252&r1=1299251&r2=1299252&view=diff
==============================================================================
---
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java
(original)
+++
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java
Sat Mar 10 18:47:50 2012
@@ -60,6 +60,7 @@ public abstract class TokenAssertionStat
if (!(parentAssertion instanceof InitiatorToken)
&& !(parentAssertion instanceof
InitiatorSignatureToken)
&& !(parentAssertion instanceof SignatureToken)
+ && !(parentAssertion instanceof ProtectionToken)
&& !(parentAssertion instanceof TransportToken)) {
return true;
}
@@ -70,6 +71,7 @@ public abstract class TokenAssertionStat
if (!(parentAssertion instanceof RecipientToken)
&& !(parentAssertion instanceof
RecipientEncryptionToken)
&& !(parentAssertion instanceof EncryptionToken)
+ && !(parentAssertion instanceof ProtectionToken)
&& !(parentAssertion instanceof TransportToken)) {
return true;
}