You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2013/01/23 22:29:35 UTC
svn commit: r1437750 - in /webservices/axiom/trunk/modules:
axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Author: veithen
Date: Wed Jan 23 21:29:35 2013
New Revision: 1437750
URL: http://svn.apache.org/viewvc?rev=1437750&view=rev
Log:
Dead code elimination: it is not possible to have a SOAPHeader or SOAPBody that is incomplete and has a builder, unless the parent SOAPEnvelope is incomplete and has a builder as well (in which case the removed code is not executed).
Modified:
webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
Modified: webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java?rev=1437750&r1=1437749&r2=1437750&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPEnvelopeImpl.java Wed Jan 23 21:29:35 2013
@@ -28,7 +28,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.impl.dom.NodeImpl;
+import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.dom.ParentNode;
import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.soap.SOAP11Constants;
@@ -223,11 +223,11 @@ public class SOAPEnvelopeImpl extends SO
OMSerializerUtil.serializeStartpart(this, writer);
OMElement header = getHeader();
if ((header != null) && (header.getFirstOMChild() != null)) {
- serializeInternally((NodeImpl) header, writer);
+ ((OMNodeEx)header).internalSerialize(writer, false);
}
SOAPBody body = getBody();
if (body != null) {
- serializeInternally((NodeImpl) body, writer);
+ ((OMNodeEx)body).internalSerialize(writer, false);
}
OMSerializerUtil.serializeEndpart(writer);
} else {
@@ -236,18 +236,6 @@ public class SOAPEnvelopeImpl extends SO
}
}
- private void serializeInternally(NodeImpl child, MTOMXMLStreamWriter writer)
- throws XMLStreamException {
- if ((!(child instanceof OMElement)) || child.isComplete() || child.getBuilder() == null) {
- child.internalSerialize(writer, false);
- } else {
- OMElement element = (OMElement) child;
- element.getBuilder().setCache(false);
- OMSerializerUtil.serializeByPullStream(element, writer, false);
- }
-// child = (NodeImpl) child.getNextOMSibling();
- }
-
public boolean hasFault() {
QName payloadQName = this.getPayloadQName_Optimized();
if (payloadQName != null) {
Modified: webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1437750&r1=1437749&r2=1437750&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Wed Jan 23 21:29:35 2013
@@ -30,7 +30,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.impl.llom.OMNodeImpl;
+import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.soap.SOAP11Constants;
@@ -224,11 +224,11 @@ public class SOAPEnvelopeImpl extends SO
OMSerializerUtil.serializeStartpart(this, writer);
OMElement header = getHeader();
if ((header != null) && (header.getFirstOMChild() != null)) {
- serializeInternally((OMNodeImpl) header, writer);
+ ((OMNodeEx)header).internalSerialize(writer, false);
}
SOAPBody body = getBody();
if (body != null) {
- serializeInternally((OMNodeImpl) body, writer);
+ ((OMNodeEx)body).internalSerialize(writer, false);
}
OMSerializerUtil.serializeEndpart(writer);
} else {
@@ -263,18 +263,6 @@ public class SOAPEnvelopeImpl extends SO
}
}
- private void serializeInternally(OMNodeImpl child, MTOMXMLStreamWriter writer)
- throws XMLStreamException {
- if ((!(child instanceof OMElement)) || child.isComplete() || child.getBuilder() == null) {
- child.internalSerialize(writer, false);
- } else {
- OMElement element = (OMElement) child;
- element.getBuilder().setCache(false);
- OMSerializerUtil.serializeByPullStream(element, writer, false);
- }
- child.getNextOMSibling();
- }
-
public boolean hasFault() {
QName payloadQName = this.getPayloadQName_Optimized();
if (payloadQName != null) {