svn commit: r1732354 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java

[ve...@apache.org]

Author: veithen
Date: Thu Feb 25 19:54:21 2016
New Revision: 1732354

URL: http://svn.apache.org/viewvc?rev=1732354&view=rev
Log:
Use the new detach API to enable deferred parsing/building for messages retrieved from externalized message contexts.

Modified:
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java?rev=1732354&r1=1732353&r2=1732354&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java Thu Feb 25 19:54:21 2016
@@ -277,11 +277,9 @@ public class MessageExternalizeUtils  im
                 boolean isSOAP = true;
                 builder = getAttachmentsBuilder(mc, mis, optimizedContentType, isSOAP);
                 envelope = (SOAPEnvelope) builder.getDocumentElement();
-                envelope.buildWithAttachments();
             } else {
                 builder = OMXMLBuilderFactory.createSOAPModelBuilder(mis, charSetEnc);
                 envelope = (SOAPEnvelope) builder.getDocumentElement();
-                envelope.build();
             }
         } catch (Exception ex) {
             // TODO: what to do if can't get the XML stream reader
@@ -291,9 +289,8 @@ public class MessageExternalizeUtils  im
                       + ex.getClass().getName() + " : " + ex.getLocalizedMessage() + "]", ex);
             envelope = null;
         } finally {
-            if (builder != null) {
-                builder.close();
-            }
+            // Prepare the builder to close the underlying stream
+            builder.detach();
             // Close the message input stream.  This will ensure that the
             // underlying stream is advanced past the message.
             mis.close();