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 2016/02/28 22:17:43 UTC
svn commit: r1732796 - in /axis/axis2/java/core/trunk/modules:
adb-codegen/src/org/apache/axis2/schema/template/
adb-tests/src/test/java/org/apache/axis2/databinding/mtom/
codegen/src/org/apache/axis2/wsdl/template/java/
fastinfoset/src/org/apache/axis...
Author: veithen
Date: Sun Feb 28 21:17:42 2016
New Revision: 1732796
URL: http://svn.apache.org/viewvc?rev=1732796&view=rev
Log:
AXIS2-5694: Make sure that the input stream is consumed before cleaning up the transport; in particular, fetch all attachments.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java
axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/builder/SOAPBuilderTest.java
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl Sun Feb 28 21:17:42 2016
@@ -405,14 +405,18 @@
<xsl:if test="not(@type=preceding-sibling::param/@type)">
if (<xsl:value-of select="@type"/>.class.equals(type)){
<xsl:choose>
- <xsl:when test="$helpermode">
- return <xsl:value-of select="@type"/>Helper.INSTANCE.parse(param.getXMLStreamReaderWithoutCaching());
- </xsl:when>
<xsl:when test="@type = 'org.apache.axiom.om.OMElement'">
return param;
</xsl:when>
<xsl:otherwise>
- return <xsl:value-of select="@type"/>.Factory.parse(param.getXMLStreamReaderWithoutCaching());
+ javax.xml.stream.XMLStreamReader reader = param.getXMLStreamReaderWithoutCaching();
+ java.lang.Object result =
+ <xsl:choose>
+ <xsl:when test="$helpermode"><xsl:value-of select="@type"/>Helper.INSTANCE.parse(reader);</xsl:when>
+ <xsl:otherwise><xsl:value-of select="@type"/>.Factory.parse(reader);</xsl:otherwise>
+ </xsl:choose>
+ reader.close();
+ return result;
</xsl:otherwise>
</xsl:choose>
Modified: axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java Sun Feb 28 21:17:42 2016
@@ -28,12 +28,10 @@ import org.apache.axis2.Constants;
import org.apache.axis2.databinding.mtom.client.MTOMServiceStub;
import org.apache.axis2.databinding.mtom.client.MTOMServiceStub.GetContent;
import org.apache.axis2.databinding.mtom.service.MTOMServiceImpl;
-import org.junit.Ignore;
import org.junit.Test;
public class MTOMTest {
@Test
- @Ignore("AXIS2-5694")
public void test() throws Exception {
int port = PortAllocator.allocatePort();
String address = "http://localhost:" + port + "/mtom";
Modified: axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl (original)
+++ axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl Sun Feb 28 21:17:42 2016
@@ -486,7 +486,7 @@
java.lang.Object object = fromOM(
_returnEnv.getBody().getFirstElement() ,
<xsl:value-of select="$outputtype"/>.class);
-
+ org.apache.axis2.transport.TransportUtils.detachInputStream(_returnMessageContext);
<xsl:choose>
<xsl:when test="$outputparamcount=1">
return get<xsl:value-of select="$outputparamshorttype"/><xsl:value-of
Modified: axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetBuilder.java Sun Feb 28 21:17:42 2016
@@ -22,7 +22,9 @@ package org.apache.axis2.fastinfoset;
import com.sun.xml.fastinfoset.stax.StAXDocumentParser;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
@@ -51,6 +53,8 @@ public class FastInfosetBuilder implemen
logger.debug("Processing a Document with the content type: " + contentType);
}
//Create a instance of the StAX Parser which can handle the fast infoset stream
- return OMXMLBuilderFactory.createStAXSOAPModelBuilder(new StAXDocumentParser(inputStream)).getDocumentElement();
+ SOAPModelBuilder builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(new StAXDocumentParser(inputStream));
+ messageContext.setProperty(Constants.BUILDER, builder);
+ return builder.getDocumentElement();
}
}
Modified: axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/src/org/apache/axis2/fastinfoset/FastInfosetPOXBuilder.java Sun Feb 28 21:17:42 2016
@@ -22,7 +22,9 @@ package org.apache.axis2.fastinfoset;
import com.sun.xml.fastinfoset.stax.StAXDocumentParser;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
import org.apache.axis2.builder.Builder;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
@@ -51,6 +53,8 @@ public class FastInfosetPOXBuilder imple
logger.debug("Processing a Document with the content type: " + contentType);
}
//Create a instance of the StAX Parser which can handle the fast infoset stream
- return OMXMLBuilderFactory.createStAXOMBuilder(new StAXDocumentParser(inputStream)).getDocumentElement();
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(new StAXDocumentParser(inputStream));
+ messageContext.setProperty(Constants.BUILDER, builder);
+ return builder.getDocumentElement();
}
}
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java Sun Feb 28 21:17:42 2016
@@ -19,9 +19,7 @@
package org.apache.axis2.jaxws.core;
-import org.apache.axiom.om.util.DetachableInputStream;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.jaxws.api.MessageAccessor;
import org.apache.axis2.jaxws.api.MessageAccessorFactory;
@@ -31,6 +29,7 @@ import org.apache.axis2.jaxws.handler.ME
import org.apache.axis2.jaxws.message.Message;
import org.apache.axis2.jaxws.message.util.MessageUtils;
import org.apache.axis2.jaxws.registry.FactoryRegistry;
+import org.apache.axis2.transport.TransportUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -356,18 +355,6 @@ public class MessageContext {
* This allows the transport layer to free resources and pool connections
*/
public void freeInputStream() throws IOException {
-
-
- // During builder processing, the original input stream was wrapped with
- // a detachable input stream. The detachable input stream's detach method
- // causes the original stream to be consumed and closed.
- DetachableInputStream is = (DetachableInputStream)
- getProperty(Constants.DETACHABLE_INPUT_STREAM);
- if (is != null) {
- if (log.isDebugEnabled()) {
- log.debug("Detaching inbound input stream " + is);
- }
- is.detach();
- }
+ TransportUtils.detachInputStream(axisMsgCtx);
}
}
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/Constants.java Sun Feb 28 21:17:42 2016
@@ -20,6 +20,10 @@
package org.apache.axis2;
+import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.TransportUtils;
+
/**
* Class Constants
*/
@@ -258,12 +262,11 @@ public class Constants extends org.apach
/**
- * On inbound requests, the detachable input stream can be queried to get
- * the inbound length. It can also be "detached" from the inbound http stream
- * to allow resources to be freed.
+ * The {@link OMXMLParserWrapper Axiom builder} of the message in a message context.
+ *
+ * @see TransportUtils#detachInputStream(MessageContext)
*/
- public static final String DETACHABLE_INPUT_STREAM =
- "org.apache.axiom.om.util.DetachableInputStream";
+ public static final String BUILDER = OMXMLParserWrapper.class.getName();
/** SOAP Role Configuration */
public static final String SOAP_ROLE_CONFIGURATION_ELEMENT = "SOAPRoleConfiguration";
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java Sun Feb 28 21:17:42 2016
@@ -22,7 +22,6 @@ package org.apache.axis2.builder;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.util.DetachableInputStream;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -49,13 +48,8 @@ public class ApplicationXMLBuilder imple
SOAPEnvelope soapEnvelope = soapFactory.getDefaultEnvelope();
if (inputStream != null) {
try {
- // Apply a detachable inputstream. This can be used later
- // to (a) get the length of the incoming message or (b)
- // free transport resources.
- DetachableInputStream is = new DetachableInputStream(inputStream);
- messageContext.setProperty(Constants.DETACHABLE_INPUT_STREAM, is);
- PushbackInputStream pushbackInputStream = new PushbackInputStream(is);
+ PushbackInputStream pushbackInputStream = new PushbackInputStream(inputStream);
int b;
if ((b = pushbackInputStream.read()) > 0) {
pushbackInputStream.unread(b);
@@ -63,6 +57,7 @@ public class ApplicationXMLBuilder imple
BuilderUtil.createPOXBuilder(pushbackInputStream,
(String) messageContext.getProperty(
Constants.Configuration.CHARACTER_SET_ENCODING));
+ messageContext.setProperty(Constants.BUILDER, builder);
OMElement documentElement = builder.getDocumentElement(true);
SOAPBody body = soapEnvelope.getBody();
body.addChild(documentElement);
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MTOMBuilder.java Sun Feb 28 21:17:42 2016
@@ -47,6 +47,7 @@ public class MTOMBuilder implements MIME
messageContext.setAttachmentMap(attachments);
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(attachments);
+ messageContext.setProperty(Constants.BUILDER, builder);
OMDocument document = builder.getDocument();
String charsetEncoding = document.getCharsetEncoding();
if (charsetEncoding == null) {
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java Sun Feb 28 21:17:42 2016
@@ -23,7 +23,6 @@ import org.apache.axiom.attachments.Atta
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.util.DetachableInputStream;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -40,16 +39,11 @@ public class SOAPBuilder implements MIME
String charSetEncoding = (String) messageContext
.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
- // Apply a detachable inputstream. This can be used later
- // to (a) get the length of the incoming message or (b)
- // free transport resources.
- DetachableInputStream is = new DetachableInputStream(inputStream);
- messageContext.setProperty(Constants.DETACHABLE_INPUT_STREAM, is);
-
// createSOAPModelBuilder takes care of configuring the underlying parser to
// avoid the security issue described in CVE-2010-1632
- OMXMLParserWrapper builder = OMXMLBuilderFactory.createSOAPModelBuilder(is,
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createSOAPModelBuilder(inputStream,
charSetEncoding);
+ messageContext.setProperty(Constants.BUILDER, builder);
SOAPEnvelope envelope = (SOAPEnvelope) builder.getDocumentElement();
BuilderUtil
.validateSOAPVersion(BuilderUtil.getEnvelopeNamespace(contentType), envelope);
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java Sun Feb 28 21:17:42 2016
@@ -21,7 +21,6 @@ package org.apache.axis2.context;
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.util.DetachableInputStream;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -1221,24 +1220,6 @@ public class MessageContext extends Abst
}
/**
- * @return inbound content length of 0
- */
- public long getInboundContentLength() throws IOException {
- // If there is an attachment map, the Attachments keep track
- // of the inbound content length.
- if (attachments != null) {
-// return attachments.getContentLength();
- }
-
- // Otherwise the length is accumulated by the DetachableInputStream.
- DetachableInputStream dis =
- (DetachableInputStream) getProperty(Constants.DETACHABLE_INPUT_STREAM);
- if (dis != null) {
- return dis.length();
- }
- return 0;
- }
- /**
* @return Returns boolean.
*/
public boolean isServerSide() {
@@ -1774,12 +1755,16 @@ public class MessageContext extends Abst
* @return attachment
*/
public Attachments getAttachmentMap() {
- if (attachments == null) {
+ return getAttachmentMap(true);
+ }
+
+ public Attachments getAttachmentMap(boolean create) {
+ if (attachments == null && create) {
attachments = new Attachments();
}
return attachments;
}
-
+
/**
* Adds an attachment to the attachment Map of this message context. This
* attachment gets serialised as a MIME attachment when sending the message
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java Sun Feb 28 21:17:42 2016
@@ -28,7 +28,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.util.DetachableInputStream;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -106,16 +105,8 @@ public class TransportUtils {
SOAPEnvelope env = createSOAPMessage(msgContext, inStream, contentType);
- // if we were told to detach, we will make the call here, this is only applicable
- // if a DetachableInputStream instance is found on the MessageContext
if(detach) {
- DetachableInputStream dis = (DetachableInputStream) msgContext.getProperty(Constants.DETACHABLE_INPUT_STREAM);
- if(dis != null) {
- if(log.isDebugEnabled()) {
- log.debug("Detaching input stream after SOAPEnvelope construction");
- }
- dis.detach();
- }
+ detachInputStream(msgContext);
}
return env;
} catch (Exception e) {
@@ -576,32 +567,28 @@ public class TransportUtils {
}
/**
- * This method can be called by components wishing to detach the DetachableInputStream
- * object that is present on the MessageContext. This is meant to shield components
- * from any logic that needs to be executed on the DetachableInputStream in order to
- * have it effectively detached. If the DetachableInputStream is not present, or if
- * the supplied MessageContext is null, no action will be taken.
+ * Prepare the message in the given message context so that the underlying input stream can be
+ * closed.
+ *
+ * @param msgContext
*/
public static void detachInputStream(MessageContext msgContext) throws AxisFault {
- try {
- if(msgContext != null
- &&
- msgContext.getProperty(Constants.DETACHABLE_INPUT_STREAM) != null) {
- DetachableInputStream dis = (DetachableInputStream) msgContext.getProperty(Constants.DETACHABLE_INPUT_STREAM);
- if(log.isDebugEnabled()) {
- log.debug("Detaching DetachableInputStream: " + dis);
- }
- dis.detach();
- }
- else {
- if(log.isDebugEnabled()) {
- log.debug("Detach not performed for MessageContext: " + msgContext);
+ if (msgContext != null) {
+ OMXMLParserWrapper builder = (OMXMLParserWrapper)msgContext.getProperty(Constants.BUILDER);
+ if (builder != null) {
+ builder.detach();
+ } else {
+ Attachments attachments = msgContext.getAttachmentMap(false);
+ if (attachments != null) {
+ attachments.getAllContentIDs();
+ } else {
+ SOAPEnvelope envelope = msgContext.getEnvelope();
+ if (envelope != null) {
+ envelope.build();
+ }
}
}
}
- catch(Throwable t) {
- throw AxisFault.makeFault(t);
- }
}
/**
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/builder/SOAPBuilderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/builder/SOAPBuilderTest.java?rev=1732796&r1=1732795&r2=1732796&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/builder/SOAPBuilderTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/builder/SOAPBuilderTest.java Sun Feb 28 21:17:42 2016
@@ -37,8 +37,7 @@ public class SOAPBuilderTest extends Abs
}
/**
- * Simple test the makes sure SOAPBuilder builds a document and
- * has a content length
+ * Simple test the makes sure SOAPBuilder builds a document
* @throws Exception
*/
public void test() throws Exception {
@@ -49,6 +48,5 @@ public class SOAPBuilderTest extends Abs
OMElement envelope = soapBuilder.processDocument(fis, "text/xml", mc);
assertTrue(envelope != null);
assertTrue(envelope instanceof SOAPEnvelope);
- assertTrue(mc.getInboundContentLength() > 2000);
}
}