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 ve...@apache.org on 2012/03/11 19:00:42 UTC
svn commit: r1299414 - in /axis/axis2/java/rampart/branches/1_6: ./
modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Author: veithen
Date: Sun Mar 11 18:00:42 2012
New Revision: 1299414
URL: http://svn.apache.org/viewvc?rev=1299414&view=rev
Log:
Merged r1299342, r1299389 and r1299390 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 11 18:00:42 2012
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090540,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090540,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1299342,1299389-1299390
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1299414&r1=1299413&r2=1299414&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java Sun Mar 11 18:00:42 2012
@@ -244,7 +244,7 @@ public class Axis2Util {
header.addChild(child);
}
- element.detach();
+ headerBlocs.remove();
soapHeader.build();
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=1299414&r1=1299413&r2=1299414&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java Sun Mar 11 18:00:42 2012
@@ -683,18 +683,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;
if (log.isDebugEnabled()) {
log.debug("Key size from RSTTemplate: " + this.keySize);