ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r391309 - in /webservices/axis2/trunk/c: include/axis2_msg_recv.h modules/core/clientapi/async_result.c modules/core/clientapi/call.c modules/core/clientapi/callback_recv.c modules/core/engine/engine.c
Date Tue, 04 Apr 2006 13:42:13 GMT
Author: samisa
Date: Tue Apr  4 06:42:11 2006
New Revision: 391309

URL: http://svn.apache.org/viewcvs?rev=391309&view=rev
Log:
Fixes to get the listner manager working to get the result on a seperate listner

Modified:
    webservices/axis2/trunk/c/include/axis2_msg_recv.h
    webservices/axis2/trunk/c/modules/core/clientapi/async_result.c
    webservices/axis2/trunk/c/modules/core/clientapi/call.c
    webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
    webservices/axis2/trunk/c/modules/core/engine/engine.c

Modified: webservices/axis2/trunk/c/include/axis2_msg_recv.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_msg_recv.h?rev=391309&r1=391308&r2=391309&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_recv.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_recv.h Tue Apr  4 06:42:11 2006
@@ -207,7 +207,8 @@
  */  
 struct axis2_msg_recv
 {
-    axis2_msg_recv_ops_t *ops;    
+    axis2_msg_recv_ops_t *ops;
+    void* derived;
 };
 
 /** 

Modified: webservices/axis2/trunk/c/modules/core/clientapi/async_result.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/async_result.c?rev=391309&r1=391308&r2=391309&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/async_result.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/async_result.c Tue Apr  4 06:42:11 2006
@@ -130,11 +130,11 @@
         async_result_impl->async_result.ops = NULL;
     }
     
-    if (async_result_impl->result)
+    /*if (async_result_impl->result)
     {
         AXIS2_MSG_CTX_FREE(async_result_impl->result, env);
         async_result_impl->result = NULL;
-    }
+    }*/
     
     AXIS2_FREE((*env)->allocator, async_result_impl);
     async_result_impl = NULL;

Modified: webservices/axis2/trunk/c/modules/core/clientapi/call.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/call.c?rev=391309&r1=391308&r2=391309&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/call.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/call.c Tue Apr  4 06:42:11 2006
@@ -572,11 +572,6 @@
     message_id = axis2_uuid_gen(env);
     AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, message_id);
     
-    if(NULL != message_id)
-    {
-        AXIS2_FREE((*env)->allocator, message_id);
-        message_id = NULL;
-    }
     
     if (call_impl->use_separate_listener) 
     {
@@ -665,6 +660,11 @@
 #endif
     }
 
+    if(NULL != message_id)
+    {
+        AXIS2_FREE((*env)->allocator, message_id);
+        message_id = NULL;
+    }
     if (engine)
     {
         AXIS2_ENGINE_FREE(engine, env);

Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?rev=391309&r1=391308&r2=391309&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Tue Apr  4 06:42:11 2006
@@ -84,6 +84,7 @@
         axis2_callback_recv_free(&(callback_recv_impl->callback_recv), env);
         return NULL;
     }
+    callback_recv_impl->base->derived = callback_recv_impl;
     callback_recv_impl->base->ops->receive = axis2_callback_recv_receive;
 
     callback_recv_impl->callback_map = axis2_hash_make(env);
@@ -193,9 +194,7 @@
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    callback_recv = (axis2_callback_recv_t*)callback_recv_param;
-
-    callback_recv_impl = AXIS2_INTF_TO_IMPL(callback_recv);
+    callback_recv_impl = AXIS2_INTF_TO_IMPL(msg_recv->derived);
     
     msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env);
     if (msg_info_headers)

Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=391309&r1=391308&r2=391309&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Apr  4 06:42:11 2006
@@ -406,7 +406,7 @@
             AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Message receiver not set in operation
description");
             return AXIS2_FAILURE;
         }
-        AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx, NULL);        
+        AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx, receiver->derived);        
     }
     AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "Axis2 engine receive successful");
     return AXIS2_SUCCESS;



Mime
View raw message