You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2005/12/28 07:56:54 UTC
svn commit: r359425 - in /webservices/axis2/trunk/c:
include/axis2_async_result.h modules/core/clientapi/src/async_result.c
modules/core/clientapi/src/callback.c
Author: samisa
Date: Tue Dec 27 22:56:47 2005
New Revision: 359425
URL: http://svn.apache.org/viewcvs?rev=359425&view=rev
Log:
More SOAP envelope related fixes
Modified:
webservices/axis2/trunk/c/include/axis2_async_result.h
webservices/axis2/trunk/c/modules/core/clientapi/src/async_result.c
webservices/axis2/trunk/c/modules/core/clientapi/src/callback.c
Modified: webservices/axis2/trunk/c/include/axis2_async_result.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_async_result.h?rev=359425&r1=359424&r2=359425&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_async_result.h (original)
+++ webservices/axis2/trunk/c/include/axis2_async_result.h Tue Dec 27 22:56:47 2005
@@ -26,6 +26,7 @@
#include <axis2_defines.h>
#include <axis2_env.h>
#include <axis2_msg_ctx.h>
+#include <axis2_soap_envelope.h>
#ifdef __cplusplus
extern "C"
@@ -47,7 +48,7 @@
*/
struct axis2_async_result_ops
{
- /*TODO axis2_soap_envelope_t* (AXIS2_CALL *get_envelope)(struct axis2_async_result *async_result, axis2_env_t **env);*/
+ axis2_soap_envelope_t* (AXIS2_CALL *get_envelope)(struct axis2_async_result *async_result, axis2_env_t **env);
axis2_msg_ctx_t* (AXIS2_CALL *get_result)(struct axis2_async_result *async_result, axis2_env_t **env);
axis2_status_t (AXIS2_CALL *free)(struct axis2_async_result *async_result,
axis2_env_t **env);
Modified: webservices/axis2/trunk/c/modules/core/clientapi/src/async_result.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/src/async_result.c?rev=359425&r1=359424&r2=359425&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/src/async_result.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/src/async_result.c Tue Dec 27 22:56:47 2005
@@ -29,7 +29,7 @@
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(async_result) ((axis2_async_result_impl_t *)async_result)
-/* TODO axis2_soap_envelope_t* AXIS2_CALL axis2_async_result_get_envelope(struct axis2_async_result *async_result, axis2_env_t **env);*/
+axis2_soap_envelope_t* AXIS2_CALL axis2_async_result_get_envelope(struct axis2_async_result *async_result, axis2_env_t **env);
axis2_msg_ctx_t* AXIS2_CALL axis2_async_result_get_result(struct axis2_async_result *async_result, axis2_env_t **env);
axis2_status_t AXIS2_CALL axis2_async_result_free (struct axis2_async_result *async_result,
axis2_env_t **env);
@@ -64,14 +64,13 @@
return NULL;
}
- /* TODO async_result_impl->async_result.ops->get_envelope = axis2_async_result_get_envelope;*/
+ async_result_impl->async_result.ops->get_envelope = axis2_async_result_get_envelope;
async_result_impl->async_result.ops->get_result = axis2_async_result_get_result;
async_result_impl->async_result.ops->free = axis2_async_result_free;
return &(async_result_impl->async_result);
}
-/* TODO
axis2_soap_envelope_t* AXIS2_CALL axis2_async_result_get_envelope(struct axis2_async_result *async_result, axis2_env_t **env)
{
axis2_async_result_impl_t *async_result_impl = NULL;
@@ -82,12 +81,11 @@
if (async_result_impl->result)
{
- return AXIS2_MSG_CTX_GET_ENVELOPE(async_result_impl->result, env);
+ return AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(async_result_impl->result, env);
}
return NULL;
}
-*/
axis2_msg_ctx_t* AXIS2_CALL axis2_async_result_get_result(struct axis2_async_result *async_result, axis2_env_t **env)
{
Modified: webservices/axis2/trunk/c/modules/core/clientapi/src/callback.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/src/callback.c?rev=359425&r1=359424&r2=359425&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/src/callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/src/callback.c Tue Dec 27 22:56:47 2005
@@ -64,7 +64,7 @@
callback_impl->callback.ops = NULL;
callback_impl->complete = AXIS2_FALSE;
- /* TODO callback_impl->envelope = NULL;*/
+ callback_impl->envelope = NULL;
callback_impl->error = AXIS2_ERROR_NONE;
/* initialize ops */
@@ -80,8 +80,8 @@
callback_impl->callback.ops->report_error = axis2_callback_report_error;
callback_impl->callback.ops->get_complete = axis2_callback_get_complete;
callback_impl->callback.ops->set_complete = axis2_callback_set_complete;
- /* TODO callback_impl->callback.ops->get_envelope = axis2_callback_get_envelope;
- callback_impl->callback.ops->set_envelope = axis2_callback_set_envelope; */
+ callback_impl->callback.ops->get_envelope = axis2_callback_get_envelope;
+ callback_impl->callback.ops->set_envelope = axis2_callback_set_envelope;
callback_impl->callback.ops->get_error = axis2_callback_get_error;
callback_impl->callback.ops->set_error = axis2_callback_set_error;
callback_impl->callback.ops->free = axis2_callback_free;
@@ -91,8 +91,8 @@
axis2_status_t AXIS2_CALL axis2_callback_invoke_on_complete(struct axis2_callback *callback, axis2_env_t **env, axis2_async_result_t *result)
{
- /*TODO return axis2_callback_set_envelope(callback, env, AXIS2_ASYNC_RESULT_GET_ENVELOPE(async_result, env));*/
- return AXIS2_SUCCESS;
+ AXIS2_FUNC_PARAM_CHECK(callback, env, AXIS2_FAILURE);
+ return axis2_callback_set_envelope(callback, env, AXIS2_ASYNC_RESULT_GET_ENVELOPE(result, env));
}
axis2_status_t AXIS2_CALL axis2_callback_report_error(struct axis2_callback *callback, axis2_env_t **env, int exception)