You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2009/01/19 11:56:19 UTC

svn commit: r735655 - /webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c

Author: manjula
Date: Mon Jan 19 02:56:18 2009
New Revision: 735655

URL: http://svn.apache.org/viewvc?rev=735655&view=rev
Log:
Fixes for Axis2C-1331

Modified:
    webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c

Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c?rev=735655&r1=735654&r2=735655&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c Mon Jan 19 02:56:18 2009
@@ -202,7 +202,7 @@
     axutil_array_list_t *mime_parts = NULL;
     axutil_param_t *callback_name_param = NULL;
     axis2_char_t *mtom_sending_callback_name = NULL;
-    
+    axis2_status_t status = AXIS2_FAILURE;
 
 
     AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
@@ -645,7 +645,7 @@
     }
     else if (M_POST == request->method_number || M_PUT == request->method_number)
     {
-        axis2_status_t status = AXIS2_FAILURE;
+        /*axis2_status_t status = AXIS2_FAILURE;*/
         if (M_POST == request->method_number)
         {
             status = axis2_http_transport_utils_process_http_post_request
@@ -1193,21 +1193,27 @@
 
         /* In mtom case we send the attachment differently */
 
-        do_mtom = axis2_msg_ctx_get_doing_mtom(out_msg_ctx, env);
-        if(do_mtom)
+        /* status = AXIS2_FAILURE means fault scenario. We are not 
+         * doing MTOM for fault cases. */
+
+        if(status != AXIS2_FAILURE)
         {
-            mime_parts = axis2_msg_ctx_get_mime_parts(out_msg_ctx, env);
-            if(!mime_parts)
+            do_mtom = axis2_msg_ctx_get_doing_mtom(out_msg_ctx, env);
+            if(do_mtom)
             {
-                return AXIS2_FAILURE;
+                mime_parts = axis2_msg_ctx_get_mime_parts(out_msg_ctx, env);
+                if(!mime_parts)
+                {
+                    return AXIS2_FAILURE;
+                }
+                callback_name_param = axis2_msg_ctx_get_parameter(msg_ctx, env ,
+                    AXIS2_MTOM_SENDING_CALLBACK);
+                if(callback_name_param)
+                {
+                    mtom_sending_callback_name =
+                        (axis2_char_t *) axutil_param_get_value (callback_name_param, env);
+                }            
             }
-            callback_name_param = axis2_msg_ctx_get_parameter(msg_ctx, env ,
-                AXIS2_MTOM_SENDING_CALLBACK);
-            if(callback_name_param)
-            {
-                mtom_sending_callback_name =
-                    (axis2_char_t *) axutil_param_get_value (callback_name_param, env);
-            }            
         }
 
         if (out_msg_ctx)