svn commit: r1328376 - /cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java

[coheigea]

Author: coheigea
Date: Fri Apr 20 13:54:28 2012
New Revision: 1328376

URL: http://svn.apache.org/viewvc?rev=1328376&view=rev
Log:
Fix a bug when a signed SAML Token is being renewed without being re-signed

Modified:
    
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java

Modified: 
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java?rev=1328376&r1=1328375&r2=1328376&view=diff
==============================================================================
--- 
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
 (original)
+++ 
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
 Fri Apr 20 13:54:28 2012
@@ -494,6 +494,12 @@ public class SAMLTokenRenewer implements
             assertion.signAssertion(
                 alias, password, signatureCrypto, useKeyValue, c14nAlgorithm, 
signatureAlgorithm
             );
+        } else {
+            if (assertion.getSaml1().getSignature() != null) {
+                assertion.getSaml1().setSignature(null);
+            } else if (assertion.getSaml2().getSignature() != null) {
+                assertion.getSaml2().setSignature(null);
+            } 
         }
         
     }