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 di...@apache.org on 2007/03/20 05:10:57 UTC
svn commit: r520265 - in /webservices/axis2/trunk/c: include/
modules/core/deployment/ modules/core/description/ modules/core/engine/
modules/core/phaseresolver/
Author: dinesh
Date: Mon Mar 19 21:10:56 2007
New Revision: 520265
URL: http://svn.apache.org/viewvc?view=rev&rev=520265
Log:
axis2_phase.h , macros removed, code formatted
Modified:
webservices/axis2/trunk/c/include/axis2_phase.h
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_out_desc.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/engine/phase.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
Modified: webservices/axis2/trunk/c/include/axis2_phase.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phase.h?view=diff&rev=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phase.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phase.h Mon Mar 19 21:10:56 2007
@@ -290,73 +290,6 @@
axis2_phase_create(const axis2_env_t *env,
const axis2_char_t *phase_name);
-/** Add handler at a given location to the phase's list of handlers. */
-#define AXIS2_PHASE_ADD_HANDLER_AT(phase, env, index, handler) \
- axis2_phase_add_handler_at(phase, env, index, handler)
-
-/** Adds the given handler to the end of the handler list. */
-#define AXIS2_PHASE_ADD_HANDLER(phase, env, handler) \
- axis2_phase_add_handler(phase, env, handler)
-
-/** Adds the handler within given handler description to the handler list. */
-#define AXIS2_PHASE_ADD_HANDLER_DESC(phase, env, handler_desc) \
- axis2_phase_add_handler_desc(phase, env, handler_desc)
-
-/**
- * Invokes phase, this method will call invoke of all the handlers in the list
- * in sequence. */
-#define AXIS2_PHASE_INVOKE(phase, env, msg_ctx) \
- axis2_phase_invoke(phase, env, msg_ctx)
-
-/** Gets phase name. */
-#define AXIS2_PHASE_GET_NAME(phase, env) \
- axis2_phase_get_name(phase, env)
-
-/** Gets handler count. */
-#define AXIS2_PHASE_GET_HANDLER_COUNT(phase, env) \
- axis2_phase_get_handler_count(phase, env)
-
-/** Sets the first handler. */
-#define AXIS2_PHASE_SET_FIRST_HANDLER(phase, env, handler) \
- axis2_phase_set_first_handler(phase, env, handler)
-
-/** Sets the last handler of the handler list. */
-#define AXIS2_PHASE_SET_LAST_HANDLER(phase, env, handler) \
- axis2_phase_set_last_handler(phase, env, handler)
-
-/** Inserts given handler based on the before phase rules of the handler. */
-#define AXIS2_PHASE_INSERT_BEFORE(phase, env, handler) \
- axis2_phase_insert_before(phase, env, handler)
-
-/** Inserts given handler based on the after phase rules of the handler. */
-#define AXIS2_PHASE_INSERT_AFTER(phase, env, handler) \
- axis2_phase_insert_after(phase, env, handler)
-
-/** Inserts given handler based on the both before and after phase rules of
- the handler. */
-#define AXIS2_PHASE_INSERT_BEFORE_AND_AFTER(phase, env, handler) \
- axis2_phase_insert_before_and_after(phase, env, handler)
-
-/** Inserts the handler within given handler description to the handler list. */
-#define AXIS2_PHASE_INSERT_HANDLER_DESC(phase, env, handler_desc) \
- axis2_phase_insert_handler_desc(phase, env, handler_desc)
-
-/** Gets all handlers as an array list. */
-#define AXIS2_PHASE_GET_ALL_HANDLERS(phase, env) \
- axis2_phase_get_all_handlers(phase, env)
-
-/** Invoke phase starting from given handler. */
-#define AXIS2_PHASE_INVOKE_START_FROM_HANDLER(phase, env, paused_handler_index, \
- msg_ctx) \
- axis2_phase_invoke_start_from_handler(phase, env, paused_handler_index, \
- msg_ctx)
-
-/** Frees phase struct. */
-#define AXIS2_PHASE_FREE(phase, env) \
- axis2_phase_free(phase, env)
-
- /** @} */
-
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Mon Mar 19 21:10:56 2007
@@ -409,7 +409,7 @@
impl_info_param = axis2_param_create(env, class_name, NULL);
if (!impl_info_param)
{
- AXIS2_PHASE_FREE(disp_phase, env);
+ axis2_phase_free(disp_phase, env);
return AXIS2_FAILURE;
}
axis2_param_set_value(impl_info_param, env, dll_desc);
@@ -424,7 +424,7 @@
axis2_handler_desc_add_param(handler_desc, env, impl_info_param);
/*disptachClas.getHandlerDesc().setParent(axisConfiguration); */
- AXIS2_PHASE_ADD_HANDLER_AT(disp_phase, env, count, handler);
+ axis2_phase_add_handler_at(disp_phase, env, count, handler);
count ++;
qname_itr_has_next = axiom_children_qname_iterator_has_next(disps,
env);
@@ -433,7 +433,7 @@
if (AXIS2_TRUE != found_disp)
{
- AXIS2_PHASE_FREE(disp_phase, env);
+ axis2_phase_free(disp_phase, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_DISPATCHER_FOUND,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -443,7 +443,7 @@
status = axis2_conf_set_dispatch_phase(conf_builder->conf, env, disp_phase);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PHASE_FREE(disp_phase, env);
+ axis2_phase_free(disp_phase, env);
return status;
}
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?view=diff&rev=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Mon Mar 19 21:10:56 2007
@@ -97,7 +97,7 @@
phase = (axis2_phase_t *) v;
if(phase)
{
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
}
}
axis2_hash_free(phases_info->op_in_phases, env);
@@ -115,7 +115,7 @@
phase = (axis2_phase_t *) v;
if(phase)
{
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
}
}
axis2_hash_free(phases_info->op_out_phases, env);
@@ -133,7 +133,7 @@
phase = (axis2_phase_t *) v;
if(phase)
{
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
}
}
axis2_hash_free(phases_info->op_in_faultphases, env);
@@ -151,7 +151,7 @@
phase = (axis2_phase_t *) v;
if(phase)
{
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
}
}
axis2_hash_free(phases_info->op_out_faultphases, env);
@@ -303,7 +303,7 @@
status = axis2_array_list_add(op_in_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
axis2_array_list_free(op_in_phases, env);
op_in_phases = NULL;
@@ -341,13 +341,13 @@
int i = 0;
int size = 0;
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
size = axis2_array_list_size(op_in_phases, env);
for (i = 0; i < size; i++)
{
phase = axis2_array_list_get(op_in_phases, env, i);
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
}
axis2_array_list_free(op_in_phases, env);
@@ -399,13 +399,13 @@
int i = 0;
int size = 0;
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
size = axis2_array_list_size(op_out_phases, env);
for (i = 0; i < size; i++)
{
phase = axis2_array_list_get(op_out_phases, env, i);
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
}
axis2_array_list_free(op_out_phases, env);
@@ -427,13 +427,13 @@
int i = 0;
int size = 0;
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
size = axis2_array_list_size(op_out_phases, env);
for (i = 0; i < size; i++)
{
phase = axis2_array_list_get(op_out_phases, env, i);
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
}
axis2_array_list_free(op_out_phases, env);
@@ -459,13 +459,13 @@
int i = 0;
int size = 0;
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
size = axis2_array_list_size(op_out_phases, env);
for (i = 0; i < size; i++)
{
phase = axis2_array_list_get(op_out_phases, env, i);
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
}
axis2_array_list_free(op_out_phases, env);
@@ -523,13 +523,13 @@
int i = 0;
int size = 0;
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
size = axis2_array_list_size(op_in_faultphases, env);
for (i = 0; i < size; i++)
{
phase = axis2_array_list_get(op_in_faultphases, env, i);
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
}
axis2_array_list_free(op_in_faultphases, env);
@@ -587,13 +587,13 @@
int i = 0;
int size = 0;
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
size = axis2_array_list_size(op_out_faultphases, env);
for (i = 0; i < size; i++)
{
phase = axis2_array_list_get(op_out_faultphases, env, i);
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
phase = NULL;
}
axis2_array_list_free(op_out_faultphases, env);
Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?view=diff&rev=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Mon Mar 19 21:10:56 2007
@@ -99,12 +99,12 @@
if (transport_in->in_phase)
{
- AXIS2_PHASE_FREE(transport_in->in_phase, env);
+ axis2_phase_free(transport_in->in_phase, env);
}
if (transport_in->fault_phase)
{
- AXIS2_PHASE_FREE(transport_in->fault_phase, env);
+ axis2_phase_free(transport_in->fault_phase, env);
}
AXIS2_FREE(env->allocator, transport_in);
@@ -234,7 +234,7 @@
if (transport_in->in_phase)
{
- AXIS2_PHASE_FREE(transport_in->in_phase, env);
+ axis2_phase_free(transport_in->in_phase, env);
}
transport_in->in_phase = in_phase;
return AXIS2_SUCCESS;
@@ -259,7 +259,7 @@
if (transport_in->fault_phase)
{
- AXIS2_PHASE_FREE(transport_in->fault_phase, env);
+ axis2_phase_free(transport_in->fault_phase, env);
}
transport_in->fault_phase = fault_phase;
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?view=diff&rev=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Mon Mar 19 21:10:56 2007
@@ -93,12 +93,12 @@
if (transport_out->out_phase)
{
- AXIS2_PHASE_FREE(transport_out->out_phase, env);
+ axis2_phase_free(transport_out->out_phase, env);
}
if (transport_out->fault_phase)
{
- AXIS2_PHASE_FREE(transport_out->fault_phase, env);
+ axis2_phase_free(transport_out->fault_phase, env);
}
AXIS2_FREE(env->allocator, transport_out);
@@ -227,7 +227,7 @@
if (transport_out->out_phase)
{
- AXIS2_PHASE_FREE(transport_out->out_phase, env);
+ axis2_phase_free(transport_out->out_phase, env);
}
transport_out->out_phase = out_phase;
return AXIS2_SUCCESS;
@@ -252,7 +252,7 @@
if (transport_out->fault_phase)
{
- AXIS2_PHASE_FREE(transport_out->fault_phase, env);
+ axis2_phase_free(transport_out->fault_phase, env);
}
transport_out->fault_phase = fault_phase;
return AXIS2_SUCCESS;
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=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Mar 19 21:10:56 2007
@@ -166,7 +166,7 @@
axis2_handler_t *handler = NULL;
handler = axis2_disp_get_base(uri_dispatch, env);
axis2_disp_free(uri_dispatch, env);
- AXIS2_PHASE_ADD_HANDLER_AT(phase, env, 0, handler);
+ axis2_phase_add_handler_at(phase, env, 0, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = NULL;
}
@@ -176,7 +176,7 @@
if (AXIS2_FAILURE == status)
{
axis2_conf_free(conf, env);
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
return NULL;
}
@@ -191,7 +191,7 @@
if (AXIS2_FAILURE == status)
{
axis2_conf_free(conf, env);
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
return NULL;
}
}
@@ -362,7 +362,7 @@
phase = (axis2_phase_t *)
axis2_array_list_get(conf->out_phases, env, i);
if (phase)
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
}
axis2_array_list_free(conf->out_phases, env);
}
@@ -376,7 +376,7 @@
phase = (axis2_phase_t *)
axis2_array_list_get(conf->in_fault_phases, env, i);
if (phase)
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
}
axis2_array_list_free(conf->in_fault_phases, env);
}
@@ -400,7 +400,7 @@
in_phases_upto_and_including_post_dispatch, env, i);
if (phase)
- AXIS2_PHASE_FREE(phase, env);
+ axis2_phase_free(phase, env);
}
axis2_array_list_free(conf->
in_phases_upto_and_including_post_dispatch, env);
@@ -1166,20 +1166,20 @@
handler = axis2_disp_get_base(soap_msg_body_based_dispatch, env);
axis2_disp_free(soap_msg_body_based_dispatch, env);
- AXIS2_PHASE_ADD_HANDLER_AT(dispatch, env, 0, handler);
+ 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)
{
- AXIS2_PHASE_FREE(dispatch, env);
+ axis2_phase_free(dispatch, env);
return AXIS2_FAILURE;
}
handler = axis2_disp_get_base(add_dispatch, env);
axis2_disp_free(add_dispatch, env);
- AXIS2_PHASE_ADD_HANDLER_AT(dispatch, env, 1, handler);
+ 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;
@@ -1191,7 +1191,7 @@
handler = axis2_disp_get_base(soap_action_based_dispatch, env);
axis2_disp_free(soap_action_based_dispatch, env);
- AXIS2_PHASE_ADD_HANDLER_AT(dispatch, env, 2, handler);
+ 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;
@@ -1199,33 +1199,33 @@
in_phases_upto_and_including_post_dispatch, env, dispatch);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PHASE_FREE(dispatch, env);
+ axis2_phase_free(dispatch, env);
return status;
}
post_dispatch = axis2_phase_create(env, AXIS2_PHASE_POST_DISPATCH);
if (! post_dispatch)
{
- AXIS2_PHASE_FREE(dispatch, env);
+ axis2_phase_free(dispatch, env);
return AXIS2_FAILURE;
}
disp_checker = axis2_disp_checker_create(env);
handler = axis2_disp_checker_get_base(disp_checker, env);
axis2_disp_checker_free(disp_checker, env);
- AXIS2_PHASE_ADD_HANDLER_AT(post_dispatch, env, 0, handler);
+ axis2_phase_add_handler_at(post_dispatch, env, 0, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = axis2_ctx_handler_create(env, NULL);
- AXIS2_PHASE_ADD_HANDLER_AT(post_dispatch, env, 1, handler);
+ axis2_phase_add_handler_at(post_dispatch, env, 1, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
status = axis2_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, post_dispatch);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PHASE_FREE(dispatch, env);
- AXIS2_PHASE_FREE(post_dispatch, env);
+ axis2_phase_free(dispatch, env);
+ axis2_phase_free(post_dispatch, env);
return status;
}
return AXIS2_SUCCESS;
@@ -1255,21 +1255,21 @@
post_dispatch = axis2_phase_create(env, AXIS2_PHASE_POST_DISPATCH);
if (! post_dispatch)
{
- AXIS2_PHASE_FREE(dispatch, env);
+ axis2_phase_free(dispatch, env);
return AXIS2_FAILURE;
}
disp_checker = axis2_disp_checker_create(env);
handler = axis2_disp_checker_get_base(disp_checker, env);
- AXIS2_PHASE_ADD_HANDLER_AT(post_dispatch, env, 0, handler);
+ axis2_phase_add_handler_at(post_dispatch, env, 0, handler);
status = axis2_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, post_dispatch);
if (AXIS2_FAILURE == status)
{
- AXIS2_PHASE_FREE(dispatch, env);
- AXIS2_PHASE_FREE(post_dispatch, env);
+ axis2_phase_free(dispatch, env);
+ axis2_phase_free(post_dispatch, env);
axis2_disp_checker_free(disp_checker, env);
return AXIS2_FAILURE;
}
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=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Mar 19 21:10:56 2007
@@ -578,9 +578,9 @@
axis2_array_list_get(phases, env, i);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Invoking phase %s", AXIS2_PHASE_GET_NAME(phase, env));
+ "Invoking phase %s", axis2_phase_get_name(phase, env));
- status = AXIS2_PHASE_INVOKE(phase, env, msg_ctx);
+ status = axis2_phase_invoke(phase, env, msg_ctx);
if (status != AXIS2_SUCCESS)
{
@@ -613,7 +613,7 @@
{
axis2_phase_t *phase = (axis2_phase_t *) axis2_array_list_get(phases,
env, i);
- const axis2_char_t *phase_name = AXIS2_PHASE_GET_NAME(phase, env);
+ const axis2_char_t *phase_name = axis2_phase_get_name(phase, env);
const axis2_char_t *paused_phase_name =
axis2_msg_ctx_get_paused_phase_name(msg_ctx, env);
/* skip invoking handlers until we find the paused phase */
@@ -627,7 +627,7 @@
env);
/* invoke the paused handler and rest of the handlers of the paused
* phase */
- AXIS2_PHASE_INVOKE_START_FROM_HANDLER(phase, env, paused_handler_i,
+ axis2_phase_invoke_start_from_handler(phase, env, paused_handler_i,
msg_ctx);
}
else
@@ -636,7 +636,7 @@
* handlers of that phase, invoke all the phases after that */
if (found_match)
{
- AXIS2_PHASE_INVOKE(phase, env, msg_ctx);
+ axis2_phase_invoke(phase, env, msg_ctx);
}
}
}
Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Mon Mar 19 21:10:56 2007
@@ -106,7 +106,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"axis2_handler_t *%s added to the index %d of the phase %s",
- axis2_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
+ axis2_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
index,
phase->name);
@@ -120,12 +120,10 @@
axis2_handler_t *handler)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
AXIS2_LOG_INFO(env->log, "Handler %s added to phase %s",
axis2_string_get_buffer(AXIS2_HANDLER_GET_NAME(handler, env), env),
phase->name);
- /*return axis2_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
}
@@ -137,7 +135,6 @@
{
int index = 0, size = 0;
axis2_status_t status = AXIS2_SUCCESS;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
axis2_msg_ctx_set_paused_phase_name(msg_ctx, env, phase->name);
@@ -184,7 +181,7 @@
/* index increment should be done after the invoke function. If the invocation
failed this handler is taken care of and no need to revoke again */
index++;
- axis2_msg_ctx_set_current_handler_index(msg_ctx, env, index);
+ axis2_msg_ctx_set_current_handler_index(msg_ctx, env, index);
}
}
}
@@ -198,8 +195,10 @@
}
else
{
- AXIS2_LOG_INFO(env->log, "Invoke the last handler %s within the phase %s",
- axis2_string_get_buffer(AXIS2_HANDLER_GET_NAME(phase->last_handler, env), env),
+ AXIS2_LOG_INFO(env->log,
+ "Invoke the last handler %s within the phase %s",
+ axis2_string_get_buffer(
+ AXIS2_HANDLER_GET_NAME(phase->last_handler, env), env),
phase->name);
status = AXIS2_HANDLER_INVOKE(phase->last_handler, env, msg_ctx);
if (status != AXIS2_SUCCESS)
@@ -679,7 +678,6 @@
{
if (i == (size - 1))
{
- /*return axis2_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
}
else
@@ -692,7 +690,6 @@
return axis2_array_list_add_at(phase->handlers, env, 0, handler);
else
{
- /*return axis2_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
}
}
@@ -781,7 +778,6 @@
if (axis2_strcmp(before_handler_name, before_name) == 0 &&
axis2_strcmp(after_handler_name, after_name) == 0)
{
- /*return axis2_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
}
}
@@ -841,13 +837,11 @@
}
else
{
- /*return axis2_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
}
}
}
}
- /*return axis2_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
}
@@ -879,7 +873,9 @@
if (!_axis2_phase_is_valid_before(phase, env, handler))
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_INVALID_HANDLER_STATE,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -897,7 +893,6 @@
status = axis2_phase_insert_after(phase, env, handler);
break;
case 3: /*AXIS2_ANYWHERE:*/
- /*status = axis2_array_list_add(phase->handlers, env, handler);*/
status = axis2_phase_add_unique(env, phase->handlers, handler);
break;
default:
@@ -969,7 +964,6 @@
{
axis2_array_list_free(phase->handlers, env);
}
-
AXIS2_FREE(env->allocator, phase);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=520265&r1=520264&r2=520265
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Mon Mar 19 21:10:56 2007
@@ -96,7 +96,7 @@
phase = (axis2_phase_t *) axis2_array_list_get(phase_holder->
phase_list, env, i);
- phase_name_l = AXIS2_PHASE_GET_NAME(phase, env);
+ phase_name_l = axis2_phase_get_name(phase, env);
if (0 == axis2_strcmp(phase_name_l, phase_name))
{
return AXIS2_TRUE;
@@ -125,7 +125,7 @@
axis2_phase_t *phase = NULL;
phase = axis2_phase_holder_get_phase(phase_holder, env, phase_name);
- status = AXIS2_PHASE_ADD_HANDLER_DESC(phase, env, handler);
+ status = axis2_phase_add_handler_desc(phase, env, handler);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Add handler %s to phase %s",
axis2_string_get_buffer(axis2_handler_desc_get_name(handler, env), env),
phase_name);
@@ -158,7 +158,7 @@
const axis2_char_t *phase_name_l = NULL;
phase = (axis2_phase_t *) axis2_array_list_get(phase_holder->
phase_list, env, i);
- phase_name_l = AXIS2_PHASE_GET_NAME(phase, env);
+ phase_name_l = axis2_phase_get_name(phase, env);
if (0 == axis2_strcmp(phase_name_l, phase_name))
{
return phase;
@@ -202,7 +202,7 @@
return status;
}
- status = AXIS2_PHASE_ADD_HANDLER(phase, env, handler);
+ status = axis2_phase_add_handler(phase, env, handler);
}
return status;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org