svn commit: r604193 - /webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java

[nandana]

Author: nandana
Date: Fri Dec 14 05:49:26 2007
New Revision: 604193

URL: http://svn.apache.org/viewvc?rev=604193&view=rev
Log:
Fixed the error in checking the signed parts. 

Modified:
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=604193&r1=604192&r2=604193&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 Fri Dec 14 05:49:26 2007
@@ -369,8 +369,8 @@
         }
 
         if( sigParts.size() > 0 && 
-                (rmd.isInitiator() && rpd.getInitiatorToken() != null) || 
-                (!rmd.isInitiator() && rpd.getRecipientToken() != null)) {
+                ((rmd.isInitiator() && rpd.getInitiatorToken() != null) || 
+                (!rmd.isInitiator() && rpd.getRecipientToken() != null))) {
             // Do signature
             this.doSignature(rmd);
         }
@@ -476,17 +476,17 @@
                     
                     
                     Element encryptedKeyElement = 
encr.getEncryptedKeyElement();
-                    this.setInsertionLocation(RampartUtil
-                            .insertSiblingAfterOrPrepend(rmd,
-                                    this.getInsertionLocation(),
-                                    encryptedKeyElement)); 
-                    
                                        
                     //Encrypt, get hold of the ref list and add it
                     refList = encr.encryptForInternalRef(null, encrParts);
                     
                     //Add internal refs
                     encryptedKeyElement.appendChild(refList);
+                    
+                    this.setInsertionLocation(RampartUtil
+                            .insertSiblingAfterOrPrepend(rmd,
+                                    this.getInsertionLocation(),
+                                    encryptedKeyElement)); 
 
 //                    RampartUtil.insertSiblingAfter(rmd,
 //                                                    
this.getInsertionLocation(),