You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by bi...@apache.org on 2020/04/15 16:08:58 UTC
[axis-axis2-java-rampart] 15/18: Merged r1299342,
r1299389 and r1299390 to the 1.5 branch.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch 1_5_x
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 922366589c9f2528659b3eba9ab2bc3b707301c0
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun Mar 11 18:08:33 2012 +0000
Merged r1299342, r1299389 and r1299390 to the 1.5 branch.
---
.../src/main/java/org/apache/rampart/util/Axis2Util.java | 2 +-
.../src/main/java/org/apache/rahas/client/STSClient.java | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
index 8eb0b55..07840f1 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
@@ -243,7 +243,7 @@ public class Axis2Util {
header.addChild(child);
}
- element.detach();
+ headerBlocs.remove();
soapHeader.build();
diff --git a/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java b/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
index 01ad8ad..3803148 100644
--- a/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
+++ b/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
@@ -661,18 +661,16 @@ public class STSClient {
Iterator templateChildren = rstTemplate.getChildElements();
while (templateChildren.hasNext()) {
- OMNode child = (OMNode) templateChildren.next();
- rst.addChild(child);
+ OMElement child = (OMElement) templateChildren.next();
+ rst.addChild(child.cloneOMElement());
//Look for the key size element
- if (child instanceof OMElement
- && ((OMElement) child).getQName().equals(
+ if (child.getQName().equals(
new QName(TrustUtil.getWSTNamespace(this.version),
RahasConstants.IssuanceBindingLocalNames.KEY_SIZE))) {
log.debug("Extracting key size from the RSTTemplate: ");
- OMElement childElem = (OMElement) child;
this.keySize =
- (childElem.getText() != null && !"".equals(childElem.getText())) ?
- Integer.parseInt(childElem.getText()) :
+ (child.getText() != null && !"".equals(child.getText())) ?
+ Integer.parseInt(child.getText()) :
-1;
log.debug("Key size from RSTTemplate: " + this.keySize);
}