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/25 21:34:28 UTC
svn commit: r1732361 - in /axis/axis2/java/core/branches/1_7: ./
modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
Author: veithen
Date: Thu Feb 25 20:34:27 2016
New Revision: 1732361
URL: http://svn.apache.org/viewvc?rev=1732361&view=rev
Log:
Merge r1732354 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 20:34:27 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354
Modified: axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java?rev=1732361&r1=1732360&r2=1732361&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java Thu Feb 25 20:34:27 2016
@@ -237,11 +237,9 @@ public class MessageExternalizeUtils im
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
@@ -251,9 +249,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();