Author: mmusaji
Date: 2013-02-13 05:55:39 -0500 (Wed, 13 Feb 2013)
New Revision: 17308
Modified:
thirdparty/wss4j/branches/wss4j-1.6.7_BZ910692/src/main/java/org/apache/ws/security/message/WSSecSignature.java
Log:
[BZ910692] Merged fixed from WSS-421
Modified:
thirdparty/wss4j/branches/wss4j-1.6.7_BZ910692/src/main/java/org/apache/ws/security/message/WSSecSignature.java
===================================================================
---
thirdparty/wss4j/branches/wss4j-1.6.7_BZ910692/src/main/java/org/apache/ws/security/message/WSSecSignature.java 2013-02-13
10:17:47 UTC (rev 17307)
+++
thirdparty/wss4j/branches/wss4j-1.6.7_BZ910692/src/main/java/org/apache/ws/security/message/WSSecSignature.java 2013-02-13
10:55:39 UTC (rev 17308)
@@ -108,6 +108,7 @@
private X509Certificate useThisCert = null;
private Element securityHeader = null;
private boolean useCustomSecRef;
+ private boolean bstAddedToSecurityHeader = false;
public WSSecSignature() {
super();
@@ -443,10 +444,10 @@
* @param secHeader The security header
*/
public void prependBSTElementToHeader(WSSecHeader secHeader) {
- if (bstToken != null) {
+ if (bstToken != null && !bstAddedToSecurityHeader) {
WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(),
bstToken.getElement());
+ bstAddedToSecurityHeader = true;
}
- bstToken = null;
}
/**
@@ -454,11 +455,11 @@
* @param secHeader The security header
*/
public void appendBSTElementToHeader(WSSecHeader secHeader) {
- if (bstToken != null) {
+ if (bstToken != null && !bstAddedToSecurityHeader) {
Element secHeaderElement = secHeader.getSecurityHeader();
secHeaderElement.appendChild(bstToken.getElement());
+ bstAddedToSecurityHeader = true;
}
- bstToken = null;
}
/**
Show replies by date