svn commit: r1051699 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

[samisa]

Author: samisa
Date: Tue Dec 21 23:43:17 2010
New Revision: 1051699

URL: http://svn.apache.org/viewvc?rev=1051699&view=rev
Log:
Fixed the problem of supporting Tokens not encrypted when protection order is 
sign before encrypting - RAMPART-288

Modified:
    
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1051699&r1=1051698&r2=1051699&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
 Tue Dec 21 23:43:17 2010
@@ -1568,7 +1568,26 @@ public class RampartUtil {
             if (supportingTokens != null && 
supportingTokens.getTokens().size() != 0) {
                 return true;
             }
-        
+       
+            supportingTokens = rpd.getEncryptedSupportingTokens();
+            if (supportingTokens != null && 
supportingTokens.getTokens().size() != 0) {
+                return true;
+            }
+            
+            supportingTokens = rpd.getSignedEncryptedSupportingTokens();
+            if (supportingTokens != null && 
supportingTokens.getTokens().size() != 0) {
+                return true;
+            }
+            
+            supportingTokens = rpd.getEndorsingEncryptedSupportingTokens();
+            if (supportingTokens != null && 
supportingTokens.getTokens().size() != 0) {
+                return true;
+            }
+            
+            supportingTokens = 
rpd.getSignedEndorsingEncryptedSupportingTokens();
+            if (supportingTokens != null && 
supportingTokens.getTokens().size() != 0) {
+                return true;
+            }
         }
         
         return false;
@@ -1744,4 +1763,4 @@ public class RampartUtil {
     }
 
 
-}
\ No newline at end of file
+}