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/05/15 20:12:41 UTC
svn commit: r1338816 -
/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
Author: veithen
Date: Tue May 15 18:12:40 2012
New Revision: 1338816
URL: http://svn.apache.org/viewvc?rev=1338816&view=rev
Log:
Eliminated a dependency on the bug described in AXIOM-422; the children of a SOAPHeaderBlock should be plain OMElements, not SOAPHeaderBlocks.
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=1338816&r1=1338815&r2=1338816&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java Tue May 15 18:12:40 2012
@@ -19,6 +19,8 @@
package org.apache.axis2.saaj;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.dom.ElementImpl;
@@ -332,23 +334,12 @@ public class SOAPHeaderImpl extends SOAP
OMNamespace namespace = new NamespaceImpl(supported, prefix + index);
- if (this.element.getOMFactory() instanceof SOAP11Factory) {
- SOAP11HeaderBlockImpl supportedEnvelop =
- new SOAP11HeaderBlockImpl(Constants.ELEM_SUPPORTEDENVELOPE,
- namespace,
- (SOAPFactory)this.element.getOMFactory());
- supportedEnvelop.addAttribute(Constants.ATTR_QNAME, prefix + index + ":"
- + Constants.ELEM_ENVELOPE, null);
- upgrade.addChild(supportedEnvelop);
- } else {
- SOAP12HeaderBlockImpl supportedEnvelop =
- new SOAP12HeaderBlockImpl(Constants.ELEM_SUPPORTEDENVELOPE,
- namespace,
- (SOAPFactory)this.element.getOMFactory());
- supportedEnvelop.addAttribute(Constants.ATTR_QNAME, prefix + index + ":"
- + Constants.ELEM_ENVELOPE, null);
- upgrade.addChild(supportedEnvelop);
- }
+ OMElement supportedEnvelop =
+ element.getOMFactory().createOMElement(Constants.ELEM_SUPPORTEDENVELOPE,
+ namespace);
+ supportedEnvelop.addAttribute(Constants.ATTR_QNAME, prefix + index + ":"
+ + Constants.ELEM_ENVELOPE, null);
+ upgrade.addChild(supportedEnvelop);
}
SOAPHeaderElementImpl soapHeaderElementImpl = new SOAPHeaderElementImpl(upgrade);
return soapHeaderElementImpl;