You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/02/06 10:09:34 UTC
svn commit: r1781860 - in /axis/axis2/java/rampart/trunk: ./
modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
Author: veithen
Date: Mon Feb 6 10:09:33 2017
New Revision: 1781860
URL: http://svn.apache.org/viewvc?rev=1781860&view=rev
Log:
RAMPART-390: SupportingToken assertions should support multiple nested protection assertions. Patch provided by Stefan Vladov.
Modified:
axis/axis2/java/rampart/trunk/ (props changed)
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
Propchange: axis/axis2/java/rampart/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 6 10:09:33 2017
@@ -1,3 +1,4 @@
/axis/axis2/java/rampart/branches/RAMPART-339:1780859-1780938
+/axis/axis2/java/rampart/branches/RAMPART-390:1781158-1781858
/axis/axis2/java/rampart/branches/RAMPART-423:1778774-1781006
/axis/axis2/java/rampart/branches/RAMPART-433:1778760-1780751
Modified: axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java?rev=1781860&r1=1781859&r2=1781860&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java Mon Feb 6 10:09:33 2017
@@ -298,16 +298,20 @@ public class SupportingToken extends Abs
if (signedParts != null) {
signedParts.serialize(writer);
-
- } else if (signedElements != null) {
+ }
+
+ if (signedElements != null) {
signedElements.serialize(writer);
-
- } else if (encryptedParts != null) {
+ }
+
+ if (encryptedParts != null) {
encryptedParts.serialize(writer);
-
- } else if (encryptedElements != null) {
+ }
+
+ if (encryptedElements != null) {
encryptedElements.serialize(writer);
}
+
// </wsp:Policy>
writer.writeEndElement();