Removing the OM traversing to look for optimisable objects as suggested by my proposal in the mailing list

Nanayakkara Kuruppuge Thilina Gunarathne · Nanayakkara Kuruppuge Thilina Gunarathne · commit 769010bf5583 · 2006-04-19T15:27:31.000Z
diff --git a/modules/codegen/test-resources/xmls/axis2.xml b/modules/codegen/test-resources/xmls/axis2.xml
@@ -2,7 +2,7 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="enableMTOM" locked="false">true</parameter>
+    <parameter name="enableMTOM" locked="false">false</parameter>
 
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>
diff --git a/modules/core/conf/axis2.xml b/modules/core/conf/axis2.xml
@@ -4,7 +4,7 @@
     <!-- ================================================= -->
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">true</parameter>
+    <parameter name="enableMTOM" locked="false">false</parameter>
     <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
 
     <!-- Uncomment this to enable REST support -->
diff --git a/modules/core/src/org/apache/axis2/Constants.java b/modules/core/src/org/apache/axis2/Constants.java
@@ -196,8 +196,6 @@ public static interface Configuration {
         public static final String HTTP_METHOD = "HTTP_METHOD";
         public static final String HTTP_METHOD_POST = "POST";
 
-        // we need to some times send the message as multipart/related, even if there is no MTOM stuff in the envelope.
-        public static final String FORCE_MIME = "ForceMimeBoundary";
         public static final String CONTENT_TYPE = "ContentType";
         public static final String IS_USING_SEPARATE_LISTENER = "IsUsingSeparateListener";
 
diff --git a/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java b/modules/core/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
@@ -56,9 +56,6 @@
 
 public class HTTPTransportUtils {
 
-    public static boolean checkEnvelopeForOptimise(SOAPEnvelope envelope) {
-        return isOptimised(envelope);
-    }
 
     public static SOAPEnvelope createEnvelopeFromGetRequest(String requestUrl, Map map ,
                                                             ConfigurationContext configurationContext) throws AxisFault {
@@ -115,20 +112,7 @@ public static boolean doWriteMTOM(MessageContext msgContext) {
             enableMTOM = Constants.VALUE_TRUE.equals(
                     msgContext.getProperty(Constants.Configuration.ENABLE_MTOM));
         }
-
-        boolean forceMIME =
-                Constants.VALUE_TRUE.equals(msgContext.getProperty(Constants.Configuration.FORCE_MIME));
-
-        if (forceMIME) {
-            return true;
-        }
-
-        // If MTOM is explicitly disabled, no need to check the envelope
-        if (!enableMTOM) {
-            return false;
-        }
-
-        return HTTPTransportUtils.checkEnvelopeForOptimise(msgContext.getEnvelope());
+        return enableMTOM;
     }
 
     public static boolean processHTTPGetRequest(MessageContext msgContext, InputStream in,
@@ -344,21 +328,4 @@ public static boolean isDoingREST(MessageContext msgContext) {
 
         return enableREST;
     }
-
-    private static boolean isOptimised(OMElement element) {
-        Iterator childrenIter = element.getChildren();
-        boolean isOptimized = false;
-
-        while (childrenIter.hasNext() && !isOptimized) {
-            OMNode node = (OMNode) childrenIter.next();
-
-            if ((OMNode.TEXT_NODE == node.getType()) && ((OMText) node).isOptimized()) {
-                isOptimized = true;
-            } else if (OMNode.ELEMENT_NODE == node.getType()) {
-                isOptimized = isOptimised((OMElement) node);
-            }
-        }
-
-        return isOptimized;
-    }
 }
diff --git a/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java b/modules/core/test/org/apache/axis2/transport/http/HTTPTransportUtilTest.java
diff --git a/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml b/modules/integration/test/org/apache/axis2/engine/chunking-disabled-axis2.xml
@@ -4,7 +4,7 @@
     <!-- ================================================= -->
     <parameter name="hotdeployment" locked="false">true</parameter>
     <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">true</parameter>
+    <parameter name="enableMTOM" locked="false">false</parameter>
     <!-- Uncomment this to enable REST support -->
     <!--    <parameter name="enableREST" locked="false">true</parameter>-->
 
diff --git a/modules/integration/test/org/apache/axis2/integration/UtilServer.java b/modules/integration/test/org/apache/axis2/integration/UtilServer.java
@@ -70,7 +70,7 @@ public static synchronized void start(String repository) throws Exception {
         if (count == 0) {
             ConfigurationContext er = getNewConfigurationContext(repository);
 
-            receiver = new SimpleHTTPServer(er, Constants.TESTING_PORT);
+            receiver = new SimpleHTTPServer(er, 5555);
 
             try {
                 receiver.start();
