svn commit: r1051693 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java

[samisa]

Author: samisa
Date: Tue Dec 21 23:17:52 2010
New Revision: 1051693

URL: http://svn.apache.org/viewvc?rev=1051693&view=rev
Log:
Fixed the problem of having SupportingToken UsernameToken always encrypted - 
RAMPART-225

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

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1051693&r1=1051692&r2=1051693&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 Tue Dec 21 23:17:52 2010
@@ -345,6 +345,7 @@ public abstract class BindingBuilder {
         //Create the list to hold the tokens
         HashMap endSuppTokMap = new HashMap();
         
+
         if(suppTokens != null && suppTokens.getTokens() != null &&
                 suppTokens.getTokens().size() > 0) {
             log.debug("Processing supporting tokens");
@@ -411,8 +412,10 @@ public abstract class BindingBuilder {
                     //Add the UT
                     Element elem = utBuilder.getUsernameTokenElement();
                     elem = RampartUtil.insertSiblingAfter(rmd, 
this.getInsertionLocation(), elem);
-                    
-                    encryptedTokensIdList.add(utBuilder.getId());
+
+                    if (suppTokens.isEncryptedToken()) {
+                        encryptedTokensIdList.add(utBuilder.getId());
+                    }
                     
                     //Move the insert location to the next element
                     this.setInsertionLocation(elem);