Avoid direct instantiation of Axiom implementation class (MTOMXMLStreamWriter).

veithen · veithen · commit ca1bde77e9d0 · 2016-05-05T16:40:52.000Z
diff --git a/modules/jaxws/src/org/apache/axis2/jaxws/api/MessageAccessor.java b/modules/jaxws/src/org/apache/axis2/jaxws/api/MessageAccessor.java
@@ -18,11 +18,6 @@
  */
 package org.apache.axis2.jaxws.api;
 
-import java.io.ByteArrayOutputStream;
-
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axis2.Constants;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.message.Message;
 import org.apache.commons.logging.Log;
@@ -58,15 +53,7 @@ public String getMessageAsString() {
         
         if (msg != null) {
             try {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                OMOutputFormat format = new OMOutputFormat();
-                String charSetEncoding = (String) mc.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING);
-                charSetEncoding = (charSetEncoding == null) ? "UTF-8" : charSetEncoding;
-                format.setCharSetEncoding(charSetEncoding);
-                MTOMXMLStreamWriter writer  = new MTOMXMLStreamWriter(baos, format);
-                msg.outputTo(writer, false);
-                writer.flush();
-                text =  baos.toString(charSetEncoding);
+                text = msg.getAsOMElement().toString();
             } catch (Throwable t) {
                 if (log.isDebugEnabled()) {
                     log.debug("Cannot access message as string", t);
