commit 5fcc55300d1a1621aa2b4b76a28ef17afe3f95e6
author Andreas Veithen <veithen@apache.org> Mon Feb 06 10:05:36 2017 +0000
committer Andreas Veithen <veithen@apache.org> Mon Feb 06 10:05:36 2017 +0000
tree 74727df5708c8c4cd0714548921bff24643b1a3e
parent f2a293ab4b744e3b55acfcd80c062f06ba3761a0
parent 8b2b5d6ca3d3d3cd3502acfdb73839dab5e313a3

Merge changes from trunk.

modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java

diff --git a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
index 74c1c55..5473529 100644
--- a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
+++ b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
@@ -298,16 +298,20 @@
         
         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();