axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r471665 - in /webservices/axis2/trunk/c/modules/core: context/ description/ receivers/ transport/http/ transport/http/receiver/ transport/http/sender/
Date Mon, 06 Nov 2006 08:40:33 GMT
Author: damitha
Date: Mon Nov  6 00:40:33 2006
New Revision: 471665

URL: http://svn.apache.org/viewvc?view=rev&rev=471665
Log:
commented the blocks mentioned in AXIS2C-310. This is tempory solution
until the real problem found.


Modified:
    webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
    webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
    webservices/axis2/trunk/c/modules/core/context/op_ctx.c
    webservices/axis2/trunk/c/modules/core/description/msg.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
    webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
    webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Mon Nov  6 00:40:33 2006
@@ -268,9 +268,6 @@
     conf_ctx_impl->conf_ctx.ops->init =
         axis2_conf_ctx_init;
 
-    conf_ctx_impl->conf_ctx.ops->free =
-        axis2_conf_ctx_free;
-
     conf_ctx_impl->conf_ctx.ops->fill_ctxs =
         axis2_conf_ctx_fill_ctxs;
 

Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Nov  6 00:40:33 2006
@@ -914,6 +914,9 @@
 
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
 
+    if (msg_ctx_impl->paused || msg_ctx_impl->keep_alive)
+        return AXIS2_SUCCESS;
+    
     if (msg_ctx_impl->msg_ctx.ops)
     {
         AXIS2_FREE(env->allocator, msg_ctx_impl->msg_ctx.ops);

Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Mon Nov  6 00:40:33 2006
@@ -383,13 +383,13 @@
         if (!out_msg_ctx)
         {
             axis2_hash_set(op_ctx_impl->msg_ctx_map,
-                    AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE, AXIS2_HASH_KEY_STRING,
+                AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE, AXIS2_HASH_KEY_STRING,
                     msg_ctx);
         }
         else
         {
             axis2_hash_set(op_ctx_impl->msg_ctx_map,
-                    AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE, AXIS2_HASH_KEY_STRING,
+                AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE, AXIS2_HASH_KEY_STRING,
                     msg_ctx);
         }
     }

Modified: webservices/axis2/trunk/c/modules/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/msg.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Mon Nov  6 00:40:33 2006
@@ -212,7 +212,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     msg_impl = AXIS2_INTF_TO_IMPL(msg);
 
-    if (msg_impl->flow)
+    /*if (msg_impl->flow)
     {
         int i = 0;
         int size = 0;
@@ -231,7 +231,7 @@
         }
         AXIS2_ARRAY_LIST_FREE(msg_impl->flow, env);
         msg_impl->flow = NULL;
-    }
+    }*/
 
     if (msg_impl->soap_headers)
     {

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Nov  6 00:40:33 2006
@@ -485,7 +485,6 @@
             }
         }
     }
-
     if (AXIS2_SUCCESS != status)
     {
         AXIS2_PHASE_FREE(message_processing, env);
@@ -513,7 +512,6 @@
             }
         }
     }
-
     if (AXIS2_SUCCESS != status)
     {
         AXIS2_PHASE_FREE(message_out, env);

Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Nov  6 00:40:33 2006
@@ -423,16 +423,15 @@
     }
     
     status = AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, out_msg_ctx);
-    /* test code */
-    if(status)
-        status = AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, msg_ctx);
-    /* end test code */
     if (!status)
     {
         axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
         AXIS2_MSG_CTX_FREE(out_msg_ctx, env);
         return status;
     }
+    status = AXIS2_OP_CTX_ADD_MSG_CTX(op_ctx, env, msg_ctx);
+    if(!status)
+        return status;
     status = AXIS2_MSG_RECV_INVOKE_IN_OUT_BUSINESS_LOGIC_SYNC(msg_recv, env,
             msg_ctx, out_msg_ctx);
     if (AXIS2_SUCCESS != status)
@@ -482,9 +481,9 @@
             !AXIS2_MSG_CTX_IS_KEEP_ALIVE(out_msg_ctx, env))
     {
         axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
-        AXIS2_MSG_CTX_FREE(out_msg_ctx, env);
-        out_msg_ctx = NULL;
     }
+    AXIS2_MSG_CTX_FREE(out_msg_ctx, env);
+    out_msg_ctx = NULL;
     return status;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Mon Nov 
6 00:40:33 2006
@@ -301,7 +301,6 @@
         }
         AXIS2_FREE(env->allocator, mime_boundary);
     }
-
     AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, soap_action_header);
     AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, soap_action_header);
     AXIS2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env,

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Mon Nov  6 00:40:33
2006
@@ -425,12 +425,8 @@
     status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response);
     AXIS2_FREE(env->allocator, url_external_form);
     url_external_form = NULL;
-    if (!AXIS2_MSG_CTX_IS_KEEP_ALIVE(msg_ctx, env) &&
-        !AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)) 
-    {
-        AXIS2_MSG_CTX_FREE(msg_ctx, env);
-        msg_ctx = NULL;
-    }
+    AXIS2_MSG_CTX_FREE(msg_ctx, env);
+    msg_ctx = NULL;
     AXIS2_URL_FREE(request_url, env);
     request_url = NULL;
     AXIS2_HTTP_SIMPLE_RESPONSE_FREE(response, env);

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Mon Nov
 6 00:40:33 2006
@@ -370,7 +370,7 @@
     /*axis2_env_free_masked(thread_env, 0x2);*/
     /*axiom_xml_reader_cleanup();*/
 #ifdef AXIS2_SVR_MULTI_THREADED
-    AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
+    /*AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);*/
 #endif
     return NULL;
 }

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=471665&r1=471664&r2=471665
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Mon
Nov  6 00:40:33 2006
@@ -172,9 +172,6 @@
     axis2_byte_t *output_stream = NULL;
     int buffer_size = 0;
 
-
-
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
 
@@ -580,7 +577,6 @@
     AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
 
     url = AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
-    soap_action = AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env);
     /*hack if (NULL == soap_action || 0 == AXIS2_STRLEN(soap_action))
     {
         soap_action = AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message