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 di...@apache.org on 2007/03/20 06:44:12 UTC
svn commit: r520286 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/description/ modules/core/engine/
modules/core/receivers/ savan/src/msgreceivers/
Author: dinesh
Date: Mon Mar 19 22:44:11 2007
New Revision: 520286
URL: http://svn.apache.org/viewvc?view=rev&rev=520286
Log:
fixed:axis2c-556, thanks Diluka for the patch
Modified:
webservices/axis2/trunk/c/include/axis2_msg_recv.h
webservices/axis2/trunk/c/include/axis2_svr_callback.h
webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
Modified: webservices/axis2/trunk/c/include/axis2_msg_recv.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_msg_recv.h?view=diff&rev=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_recv.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_recv.h Mon Mar 19 22:44:11 2007
@@ -189,38 +189,6 @@
AXIS2_EXTERN axis2_msg_recv_t *AXIS2_CALL
axis2_msg_recv_create (const axis2_env_t *env);
-/** Frees the message receiver. */
-#define AXIS2_MSG_RECV_FREE(msg_recv, env) axis2_msg_recv_free (msg_recv, env)
-
-/** Receive. */
-#define AXIS2_MSG_RECV_RECEIVE(msg_recv, env, msg_ctx, callback_recv_param) \
- axis2_msg_recv_receive (msg_recv, env, msg_ctx, callback_recv_param)
-
-/** Invoke in out business logic sync. */
-#define AXIS2_MSG_RECV_INVOKE_IN_OUT_BUSINESS_LOGIC_SYNC(msg_recv, env, \
- in_msg_ctx, out_msg_ctx) \
- axis2_msg_recv_invoke_business_logic (msg_recv, env, \
- in_msg_ctx, out_msg_ctx)
-
-/** Make new svc obj. */
-#define AXIS2_MSG_RECV_MAKE_NEW_SVC_OBJ(msg_recv, env, msg_ctx) \
- axis2_msg_recv_make_new_svc_obj(msg_recv, env, msg_ctx)
-
-/** Get impl obj. */
-#define AXIS2_MSG_RECV_GET_IMPL_OBJ(msg_recv, env, msg_ctx) \
- axis2_msg_recv_get_impl_obj(msg_recv, env, msg_ctx)
-
-/** Set scope. */
-#define AXIS2_MSG_RECV_SET_SCOPE(msg_recv, env, scope) \
- axis2_msg_recv_set_scope(msg_recv, env, scope)
-
-/** Get scope. */
-#define AXIS2_MSG_RECV_GET_SCOPE(msg_recv, env) \
- axis2_msg_recv_get_scope(msg_recv, env)
-
-/** Delete svc obj. */
-#define AXIS2_MSG_RECV_DELETE_SVC_OBJ(msg_recv, env, msg_ctx) \
- axis2_msg_recv_delete_svc_obj(msg_recv, env, msg_ctx)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_svr_callback.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svr_callback.h?view=diff&rev=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svr_callback.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svr_callback.h Mon Mar 19 22:44:11 2007
@@ -82,17 +82,6 @@
AXIS2_EXTERN axis2_svr_callback_t *AXIS2_CALL
axis2_svr_callback_create(const axis2_env_t *env);
-/** Frees server callback. */
-#define AXIS2_SVR_CALLBACK_FREE(svr_callback, env) \
- axis2_svr_callback_free (svr_callback, env)
-
-/** Handler result. */
-#define AXIS2_SVR_CALLBACK_HANDLER_RESULT(svr_callback, env, msg_ctx) \
- axis2_svr_callback_handle_result (svr_callback, env, msg_ctx)
-
-/** Handler fault. */
-#define AXIS2_SVR_CALLBACK_HANDLER_FAULT(svr_callback, env, msg_ctx) \
- axis2_svr_callback_handle_fault (svr_callback, env, msg_ctx)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?view=diff&rev=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Mon Mar 19 22:44:11 2007
@@ -119,7 +119,7 @@
if (callback_recv->base && callback_recv->base_deep_copy)
{
- AXIS2_MSG_RECV_FREE(callback_recv->base, env);
+ axis2_msg_recv_free(callback_recv->base, env);
}
if (callback_recv)
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=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Mar 19 22:44:11 2007
@@ -203,7 +203,7 @@
if (op->msg_recv)
{
- AXIS2_MSG_RECV_FREE(op->msg_recv, env);
+ axis2_msg_recv_free(op->msg_recv, env);
}
if (op->module_qnames)
{
@@ -374,7 +374,7 @@
if (op->msg_recv)
{
- AXIS2_MSG_RECV_FREE(op->msg_recv, env);
+ axis2_msg_recv_free(op->msg_recv, env);
op->msg_recv = NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Mar 19 22:44:11 2007
@@ -423,7 +423,7 @@
msg_recv = (axis2_msg_recv_t *) val;
if (msg_recv)
{
- AXIS2_MSG_RECV_FREE(msg_recv, env);
+ axis2_msg_recv_free(msg_recv, env);
msg_recv = NULL;
}
}
@@ -925,7 +925,8 @@
{
axis2_hash_this(index_j, NULL, NULL, &value2);
svc = (axis2_svc_t *) value2;
- svc_name = axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(svc, env), env);
+ svc_name =
+ axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(svc, env), env);
axis2_hash_set(conf->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING, svc);
@@ -1011,7 +1012,6 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_recv, AXIS2_FAILURE);
-
if (!conf->msg_recvs)
{
conf->msg_recvs = axis2_hash_make(env);
@@ -1127,7 +1127,6 @@
if (module_qname)
{
axis2_char_t *module_name = NULL;
-
module_name = axis2_qname_to_string((axis2_qname_t *)module_qname, env);
axis2_hash_set(conf->all_modules, module_name,
AXIS2_HASH_KEY_STRING, module);
@@ -1168,7 +1167,6 @@
axis2_disp_free(soap_msg_body_based_dispatch, env);
axis2_phase_add_handler_at(dispatch, env, 0, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
- handler = NULL;
add_dispatch = axis2_addr_disp_create(env);
if (!add_dispatch)
@@ -1181,7 +1179,6 @@
axis2_disp_free(add_dispatch, env);
axis2_phase_add_handler_at(dispatch, env, 1, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
- handler = NULL;
soap_action_based_dispatch = axiom_soap_action_disp_create(env);
if (!soap_action_based_dispatch)
@@ -1193,7 +1190,6 @@
axis2_disp_free(soap_action_based_dispatch, env);
axis2_phase_add_handler_at(dispatch, env, 2, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
- handler = NULL;
status = axis2_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, dispatch);
@@ -1439,7 +1435,7 @@
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
def_ver_map = conf->name_to_version_map;
- if (! def_ver_map)
+ if (!def_ver_map)
{
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Mar 19 22:44:11 2007
@@ -285,7 +285,7 @@
"Message receiver not set in operation description");
return AXIS2_FAILURE;
}
- status = AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx,
+ status = axis2_msg_recv_receive(receiver, env, msg_ctx,
axis2_msg_recv_get_derived(receiver, env));
}
else
@@ -793,7 +793,7 @@
"Message receiver not set in operation description");
return AXIS2_FAILURE;
}
- status = AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx,
+ status = axis2_msg_recv_receive(receiver, env, msg_ctx,
axis2_msg_recv_get_derived(receiver, 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=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Mar 19 22:44:11 2007
@@ -71,17 +71,16 @@
void *callback_recv_param);
AXIS2_EXPORT axis2_msg_recv_t *AXIS2_CALL
-axis2_msg_recv_create(
- const axis2_env_t *env)
+axis2_msg_recv_create(const axis2_env_t *env)
{
axis2_msg_recv_t *msg_recv = NULL;
AXIS2_ENV_CHECK(env, NULL);
msg_recv = (axis2_msg_recv_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_msg_recv_t));
+ sizeof(axis2_msg_recv_t));
- if (! msg_recv)
+ if (!msg_recv)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -94,8 +93,7 @@
}
AXIS2_EXPORT axis2_status_t AXIS2_CALL
-axis2_msg_recv_free(
- axis2_msg_recv_t *msg_recv,
+axis2_msg_recv_free(axis2_msg_recv_t *msg_recv,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -114,8 +112,7 @@
}
AXIS2_EXPORT axis2_svc_skeleton_t *AXIS2_CALL
-axis2_msg_recv_make_new_svc_obj(
- axis2_msg_recv_t *msg_recv,
+axis2_msg_recv_make_new_svc_obj(axis2_msg_recv_t *msg_recv,
const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx)
{
@@ -128,10 +125,10 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
- op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
- svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
- svc = axis2_svc_ctx_get_svc(svc_ctx, env);
- if (! svc)
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+ svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
+ svc = axis2_svc_ctx_get_svc(svc_ctx, env);
+ if (!svc)
{
return NULL;
}
@@ -146,7 +143,7 @@
if (!impl_info_param)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
@@ -164,8 +161,7 @@
AXIS2_EXPORT axis2_svc_skeleton_t *AXIS2_CALL
-axis2_msg_recv_get_impl_obj(
- axis2_msg_recv_t *msg_recv,
+axis2_msg_recv_get_impl_obj(axis2_msg_recv_t *msg_recv,
const axis2_env_t *env,
struct axis2_msg_ctx *msg_ctx)
{
@@ -173,13 +169,12 @@
struct axis2_op_ctx *op_ctx = NULL;
struct axis2_svc_ctx *svc_ctx = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
- op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
- svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
- svc = axis2_svc_ctx_get_svc(svc_ctx, env);
- if (! svc)
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+ svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
+ svc = axis2_svc_ctx_get_svc(svc_ctx, env);
+ if (!svc)
{
return NULL;
}
@@ -188,8 +183,7 @@
}
AXIS2_EXPORT axis2_status_t AXIS2_CALL
-axis2_msg_recv_set_scope(
- axis2_msg_recv_t *msg_recv,
+axis2_msg_recv_set_scope(axis2_msg_recv_t *msg_recv,
const axis2_env_t *env,
const axis2_char_t *scope)
{
@@ -199,7 +193,6 @@
if (msg_recv->scope)
{
AXIS2_FREE(env->allocator, msg_recv->scope);
- msg_recv->scope = NULL;
}
msg_recv->scope = axis2_strdup(scope, env);
if (!msg_recv->scope)
@@ -211,16 +204,14 @@
}
AXIS2_EXPORT axis2_char_t *AXIS2_CALL
-axis2_msg_recv_get_scope(
- axis2_msg_recv_t *msg_recv,
+axis2_msg_recv_get_scope(axis2_msg_recv_t *msg_recv,
const axis2_env_t *env)
{
return msg_recv->scope;
}
AXIS2_EXPORT axis2_status_t AXIS2_CALL
-axis2_msg_recv_delete_svc_obj(
- axis2_msg_recv_t *msg_recv,
+axis2_msg_recv_delete_svc_obj(axis2_msg_recv_t *msg_recv,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
@@ -235,10 +226,10 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
- svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
- svc = axis2_svc_ctx_get_svc(svc_ctx, env);
- if (! svc)
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+ svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
+ svc = axis2_svc_ctx_get_svc(svc_ctx, env);
+ if (!svc)
{
return AXIS2_FAILURE;
}
@@ -249,7 +240,7 @@
param_value = axis2_param_get_value(scope_param, env);
}
if (param_value && (0 == axis2_strcmp(AXIS2_APPLICATION_SCOPE,
- param_value)))
+ param_value)))
{
return AXIS2_SUCCESS;
}
@@ -258,7 +249,7 @@
if (!impl_info_param)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
dll_desc = axis2_param_get_value(impl_info_param, env);
@@ -286,11 +277,11 @@
{
return AXIS2_FAILURE;
}
- op_ctx = axis2_msg_ctx_get_op_ctx(out_msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(out_msg_ctx, env);
if (!op_ctx)
{
axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
- axis2_msg_ctx_free(out_msg_ctx, env);
+ axis2_msg_ctx_free(out_msg_ctx, env);
return AXIS2_FAILURE;
}
@@ -298,37 +289,40 @@
if (!status)
{
axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
- axis2_msg_ctx_free(out_msg_ctx, env);
+ 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);
+ status = axis2_msg_recv_invoke_business_logic(msg_recv, env,
+ msg_ctx, out_msg_ctx);
if (AXIS2_SUCCESS != status)
{
axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
- axis2_msg_ctx_free(out_msg_ctx, env);
+ axis2_msg_ctx_free(out_msg_ctx, env);
return status;
}
- svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
- conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
+ svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
+ conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
engine = axis2_engine_create(env, conf_ctx);
if (!engine)
{
- axis2_msg_ctx_free(out_msg_ctx, env);
+ axis2_msg_ctx_free(out_msg_ctx, env);
return AXIS2_FAILURE;
}
if ( axis2_msg_ctx_get_soap_envelope(out_msg_ctx, env))
{
axiom_soap_envelope_t *soap_envelope = axis2_msg_ctx_get_soap_envelope(
- out_msg_ctx, env);
+ out_msg_ctx, env);
if (soap_envelope)
{
axiom_soap_body_t *body = axiom_soap_envelope_get_body(soap_envelope,
- env);
+ env);
if (body)
{
/* in case of a SOAP fault, we got to return failure so that
@@ -336,9 +330,9 @@
if (axiom_soap_body_has_fault(body, env))
{
status = AXIS2_FAILURE;
- axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env,
- soap_envelope);
- axis2_msg_ctx_set_soap_envelope(out_msg_ctx, env, NULL);
+ axis2_msg_ctx_set_fault_soap_envelope(msg_ctx, env,
+ soap_envelope);
+ axis2_msg_ctx_set_soap_envelope(out_msg_ctx, env, NULL);
}
else
{
@@ -350,8 +344,8 @@
}
}
axis2_engine_free(engine, env);
- if (! axis2_msg_ctx_is_paused(out_msg_ctx, env) &&
- ! axis2_msg_ctx_is_keep_alive(out_msg_ctx, env))
+ if (!axis2_msg_ctx_is_paused(out_msg_ctx, env) &&
+ !axis2_msg_ctx_is_keep_alive(out_msg_ctx, env))
{
axis2_core_utils_reset_out_msg_ctx(env, out_msg_ctx);
}
@@ -386,7 +380,6 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXPORT void *AXIS2_CALL
axis2_msg_recv_get_derived(const axis2_msg_recv_t *msg_recv,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Mon Mar 19 22:44:11 2007
@@ -32,23 +32,22 @@
axis2_msg_ctx_t *new_msg_ctx);
AXIS2_EXTERN axis2_msg_recv_t *AXIS2_CALL
-axis2_raw_xml_in_out_msg_recv_create(
- const axis2_env_t *env)
+axis2_raw_xml_in_out_msg_recv_create(const axis2_env_t *env)
{
axis2_msg_recv_t *msg_recv = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
msg_recv = axis2_msg_recv_create(env);
- if (! msg_recv)
+ if (!msg_recv)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- status = AXIS2_MSG_RECV_SET_SCOPE(msg_recv, env, AXIS2_APPLICATION_SCOPE);
+ status = axis2_msg_recv_set_scope(msg_recv, env, AXIS2_APPLICATION_SCOPE);
if (AXIS2_TRUE != status)
{
- AXIS2_MSG_RECV_FREE(msg_recv, env);
+ axis2_msg_recv_free(msg_recv, env);
return NULL;
}
@@ -58,8 +57,7 @@
}
static axis2_status_t AXIS2_CALL
-axis2_raw_xml_in_out_msg_recv_invoke_business_logic_sync(
- axis2_msg_recv_t *msg_recv,
+axis2_raw_xml_in_out_msg_recv_invoke_business_logic_sync(axis2_msg_recv_t *msg_recv,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx,
axis2_msg_ctx_t *new_msg_ctx)
@@ -92,7 +90,7 @@
AXIS2_PARAM_CHECK(env->error, new_msg_ctx, AXIS2_FAILURE);
/* get the implementation class for the Web Service */
- svc_obj = AXIS2_MSG_RECV_GET_IMPL_OBJ(msg_recv, env, msg_ctx);
+ svc_obj = axis2_msg_recv_get_impl_obj(msg_recv, env, msg_ctx);
if (!svc_obj)
{
@@ -109,16 +107,16 @@
}
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Impl object for service '%s' not set in message receiver. %d :: %s",
- svc_name,
- env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ "Impl object for service '%s' not set in message receiver. %d :: %s",
+ svc_name,
+ env->error->error_number,
+ AXIS2_ERROR_GET_MESSAGE(env->error));
status = AXIS2_FAILURE;
}
else
{
- op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
- op_desc = axis2_op_ctx_get_op(op_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+ op_desc = axis2_op_ctx_get_op(op_ctx, env);
style = axis2_op_get_style(op_desc, env);
if (0 == axis2_strcmp(AXIS2_STYLE_DOC, style))
@@ -126,7 +124,7 @@
axiom_soap_envelope_t *envelope = NULL;
axiom_soap_body_t *body = NULL;
- envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
+ envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
body = axiom_soap_envelope_get_body(envelope, env);
om_node = axiom_soap_body_get_base_node(body, env);
om_element = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
@@ -139,7 +137,7 @@
axiom_node_t *op_node = NULL;
axiom_element_t *op_element = NULL;
- envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
+ envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
body = axiom_soap_envelope_get_body(envelope, env);
op_node = axiom_soap_body_get_base_node(body, env);
op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
@@ -164,7 +162,7 @@
axis2_char_t *function_name = NULL;
function_name = (axis2_char_t *) axis2_array_list_get(
- function_arr, env, i);
+ function_arr, env, i);
if (0 == axis2_strcmp(function_name, local_name))
{
matches = AXIS2_TRUE;
@@ -180,28 +178,28 @@
else
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_OM_ELEMENT_MISMATCH, AXIS2_FAILURE);
+ AXIS2_ERROR_OM_ELEMENT_MISMATCH, AXIS2_FAILURE);
status = AXIS2_FAILURE;
}
}
else
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_OM_ELEMENT_INVALID_STATE, AXIS2_FAILURE);
+ AXIS2_ERROR_OM_ELEMENT_INVALID_STATE, AXIS2_FAILURE);
status = AXIS2_FAILURE;
}
}
else
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_RPC_NEED_MATCHING_CHILD, AXIS2_FAILURE);
+ AXIS2_ERROR_RPC_NEED_MATCHING_CHILD, AXIS2_FAILURE);
status = AXIS2_FAILURE;
}
}
else
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_UNKNOWN_STYLE, AXIS2_FAILURE);
+ AXIS2_ERROR_UNKNOWN_STYLE, AXIS2_FAILURE);
status = AXIS2_FAILURE;
}
@@ -209,9 +207,6 @@
{
skel_invoked = AXIS2_TRUE;
result_node = AXIS2_SVC_SKELETON_INVOKE(svc_obj, env, om_node, new_msg_ctx);
- /*if (result_node)
- AXIS2_SVC_SKELETON_FREE(svc_obj, env);
- */
}
if (result_node)
@@ -230,21 +225,19 @@
else
{
body_content_element = axiom_element_create(env, NULL, res_name,
- ns, &body_content_node);
+ ns, &body_content_node);
AXIOM_NODE_ADD_CHILD(body_content_node, env, result_node);
}
}
else
{
body_content_node = result_node;
-
}
}
else
{
status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
- fault_node = AXIS2_SVC_SKELETON_ON_FAULT (svc_obj, env, om_node);
- /*AXIS2_SVC_SKELETON_FREE(svc_obj, env);*/
+ fault_node = AXIS2_SVC_SKELETON_ON_FAULT(svc_obj, env, om_node);
}
}
@@ -302,7 +295,9 @@
const axis2_char_t *err_msg = NULL;
if (!skel_invoked)
+ {
fault_value_str = "env:Receiver";
+ }
err_msg = AXIS2_ERROR_GET_MESSAGE(env->error);
if (err_msg)
@@ -315,23 +310,23 @@
}
soap_fault = axiom_soap_fault_create_default_fault(env, out_body,
- fault_value_str, fault_reason_str, soap_version);
- if (fault_node)
- {
- fault_detail = axiom_soap_fault_detail_create_with_parent (env, soap_fault);
- axiom_soap_fault_detail_add_detail_entry (fault_detail, env, fault_node);
- }
+ fault_value_str, fault_reason_str, soap_version);
+ if (fault_node)
+ {
+ fault_detail = axiom_soap_fault_detail_create_with_parent (env, soap_fault);
+ axiom_soap_fault_detail_add_detail_entry (fault_detail, env, fault_node);
+ }
}
if (body_content_node)
{
AXIOM_NODE_ADD_CHILD(out_node , env, body_content_node);
- status = axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
+ status = axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
}
else if (soap_fault)
{
axis2_msg_ctx_set_soap_envelope(new_msg_ctx, env, default_envelope);
- status = AXIS2_SUCCESS;
+ status = AXIS2_SUCCESS;
}
else
{
@@ -344,8 +339,7 @@
return status;
}
-AXIS2_EXPORT int axis2_get_instance(
- struct axis2_msg_recv **inst,
+AXIS2_EXPORT int axis2_get_instance(struct axis2_msg_recv **inst,
const axis2_env_t *env)
{
*inst = axis2_raw_xml_in_out_msg_recv_create(env);
@@ -357,14 +351,13 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXPORT int axis2_remove_instance(
- struct axis2_msg_recv *inst,
+AXIS2_EXPORT int axis2_remove_instance(struct axis2_msg_recv *inst,
const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
{
- status = AXIS2_MSG_RECV_FREE(inst, env);
+ status = axis2_msg_recv_free(inst, env);
}
return status;
}
Modified: webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c?view=diff&rev=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c Mon Mar 19 22:44:11 2007
@@ -24,17 +24,16 @@
};
AXIS2_EXPORT axis2_svr_callback_t *AXIS2_CALL
-axis2_svr_callback_create(
- const axis2_env_t *env)
+axis2_svr_callback_create(const axis2_env_t *env)
{
axis2_svr_callback_t *svr_callback = NULL;
AXIS2_ENV_CHECK(env, NULL);
svr_callback = (axis2_svr_callback_t *)
- AXIS2_MALLOC(env->allocator, sizeof(axis2_svr_callback_t));
+ AXIS2_MALLOC(env->allocator, sizeof(axis2_svr_callback_t));
- if (! svr_callback)
+ if (!svr_callback)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -44,8 +43,7 @@
}
AXIS2_EXPORT axis2_status_t AXIS2_CALL
-axis2_svr_callback_free(
- axis2_svr_callback_t *svr_callback,
+axis2_svr_callback_free(axis2_svr_callback_t *svr_callback,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -59,8 +57,7 @@
}
AXIS2_EXPORT axis2_status_t AXIS2_CALL
-axis2_svr_callback_handle_result(
- axis2_svr_callback_t *svr_callback,
+axis2_svr_callback_handle_result(axis2_svr_callback_t *svr_callback,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
@@ -72,9 +69,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
- svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
- conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+ svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
+ conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
engine = axis2_engine_create(env, conf_ctx);
if (!engine)
{
@@ -84,8 +81,7 @@
}
AXIS2_EXPORT axis2_status_t AXIS2_CALL
-axis2_svr_callback_handle_fault(
- axis2_svr_callback_t *svr_callback,
+axis2_svr_callback_handle_fault(axis2_svr_callback_t *svr_callback,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
@@ -98,16 +94,16 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
- svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
- conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+ svc_ctx = axis2_op_ctx_get_parent(op_ctx, env);
+ conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
engine = axis2_engine_create(env, conf_ctx);
if (!engine)
{
return AXIS2_FAILURE;
}
- fault_ctx = axis2_engine_create_fault_msg_ctx(engine, env, msg_ctx);
+ fault_ctx = axis2_engine_create_fault_msg_ctx(engine, env, msg_ctx);
return axis2_engine_send_fault(engine, env, fault_ctx);
}
Modified: webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c?view=diff&rev=520286&r1=520285&r2=520286
==============================================================================
--- webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c Mon Mar 19 22:44:11 2007
@@ -90,12 +90,12 @@
return NULL;
}
- status = AXIS2_MSG_RECV_SET_SCOPE(msg_recv, env, AXIS2_APPLICATION_SCOPE);
+ status = axis2_msg_recv_set_scope(msg_recv, env, AXIS2_APPLICATION_SCOPE);
if (status != AXIS2_TRUE)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to set "
"message receiver scope");
- AXIS2_MSG_RECV_FREE(msg_recv, env);
+ axis2_msg_recv_free(msg_recv, env);
return NULL;
}
@@ -119,7 +119,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan][msg recv] invoke called");
/* this call will load and create the service object. */
- /*axis2_svc_skeleton_t* svc_obj = AXIS2_MSG_RECV_GET_IMPL_OBJ(msg_recv, env,
+ /*axis2_svc_skeleton_t* svc_obj = axis2_msg_recv_get_impl_obj(msg_recv, env,
msg_ctx);
if (!svc_obj)
{
@@ -508,7 +508,7 @@
axis2_status_t status = AXIS2_FAILURE;
if (inst)
{
- status = AXIS2_MSG_RECV_FREE(inst, env);
+ status = axis2_msg_recv_free(inst, env);
}
return status;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org