Author: coheigea
Date: Mon Nov 5 17:10:33 2012
New Revision: 1405880
URL: http://svn.apache.org/viewvc?rev=1405880&view=rev
Log:
Merged revisions 1405874 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1405874 | coheigea | 2012-11-05 16:49:59 +0000 (Mon, 05 Nov 2012) | 2 lines
[CXF-4612] - SAML assertion element is not imported into SecurityHeader
document
........
Modified:
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Modified:
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1405880&r1=1405879&r2=1405880&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Mon Nov 5 17:10:33 2012
@@ -695,10 +695,11 @@ public abstract class AbstractBindingBui
// TODO We only support using a KeyIdentifier for the
moment
SecurityTokenReference secRef =
createSTRForSamlAssertion(doc,
assertionWrapper.getId(), saml1, false);
- addSupportingElement(secRef.getElement());
+ Element clone = cloneElement(secRef.getElement());
+ addSupportingElement(clone);
part = new WSEncryptionPart("STRTransform", null,
"Element");
part.setId(secRef.getID());
- part.setElement(secRef.getElement());
+ part.setElement(clone);
}
} else if (tempTok instanceof WSSecurityTokenHolder) {
SecurityToken token =
((WSSecurityTokenHolder)tempTok).getToken();