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/19 20:24:53 UTC
svn commit: r520053 - in /webservices/axis2/trunk/c: include/
modules/core/deployment/ modules/core/description/ modules/core/engine/
modules/core/phaseresolver/ modules/core/transport/http/sender/libcurl/
modules/core/transport/http/util/
Author: dinesh
Date: Mon Mar 19 12:24:52 2007
New Revision: 520053
URL: http://svn.apache.org/viewvc?view=rev&rev=520053
Log:
axis2c-555, patch applied, thanks Diluka
Modified:
webservices/axis2/trunk/c/include/axis2_phase_holder.h
webservices/axis2/trunk/c/include/axis2_phase_resolver.h
webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/description/svc_grp.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
Modified: webservices/axis2/trunk/c/include/axis2_phase_holder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phase_holder.h?view=diff&rev=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phase_holder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phase_holder.h Mon Mar 19 12:24:52 2007
@@ -138,26 +138,6 @@
axis2_phase_holder_create_with_phases(const axis2_env_t *env,
axis2_array_list_t *phases);
-/** Frees phase holder. */
-#define AXIS2_PHASE_HOLDER_FREE(phase_holder, env) \
- axis2_phase_holder_free (phase_holder, env)
-
-/** Checks of a named phase exist. */
-#define AXIS2_PHASE_HOLDER_IS_PHASE_EXIST(phase_holder, env, phase_name) \
- axis2_phase_holder_is_phase_exist (phase_holder, env, phase_name)
-
-/** Adds handler. */
-#define AXIS2_PHASE_HOLDER_ADD_HANDLER(phase_holder, env, handler) \
- axis2_phase_holder_add_handler (phase_holder, env, handler)
-
-/** Gets named phase. */
-#define AXIS2_PHASE_HOLDER_GET_PHASE(phase_holder, env, phase_name) \
- axis2_phase_holder_get_phase (phase_holder, env, phase_name)
-
-/** Builds transport handler chain. */
-#define AXIS2_PHASE_HOLDER_BUILD_TRANSPORT_HANDLER_CHAIN(phase_holder, env, phase, handlers) \
- axis2_phase_holder_build_transport_handler_chain (phase_holder, env, phase, handlers)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_phase_resolver.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phase_resolver.h?view=diff&rev=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phase_resolver.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phase_resolver.h Mon Mar 19 12:24:52 2007
@@ -211,38 +211,6 @@
struct axis2_conf *axis2_config,
struct axis2_svc *svc);
-/** Frees phase resolver. */
-#define AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env) \
- axis2_phase_resolver_free (phase_resolver, env)
-
-/** Builds execution chains. */
-#define AXIS2_PHASE_RESOLVER_BUILD_CHAINS(phase_resolver, env) \
- axis2_phase_resolver_build_chains (phase_resolver, env)
-
-/** Builds module operations. */
-#define AXIS2_PHASE_RESOLVER_BUILD_MODULE_OP(phase_resolver, env, op) \
- axis2_phase_resolver_build_module_op (phase_resolver, env, op)
-
-/** Builds transport chains. */
-#define AXIS2_PHASE_RESOLVER_BUILD_TRANSPORT_CHAINS(phase_resolver, env) \
- axis2_phase_resolver_build_transport_chains (phase_resolver, env)
-
-/** Engages module globally. */
-#define AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_GLOBALLY(phase_resolver, env, module) \
- axis2_phase_resolver_engage_module_globally (phase_resolver, env, module)
-
-/** Engages module to service from global module. */
-#define AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_SVC_FROM_GLOBAL(phase_resolver, env, svc, module_desc) \
- axis2_phase_resolver_engage_module_to_svc_from_global (phase_resolver, env, svc, module_desc)
-
-/** Engage module to service. */
-#define AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_SVC(phase_resolver, env, svc, module_desc) \
- axis2_phase_resolver_engage_module_to_svc (phase_resolver, env, svc, module_desc)
-
-/** Engage module to operation. */
-#define AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_OP(phase_resolver, env, axis_op, module_desc) \
- axis2_phase_resolver_engage_module_to_op (phase_resolver, env, axis_op, module_desc)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_init.c?view=diff&rev=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Mon Mar 19 12:24:52 2007
@@ -67,12 +67,12 @@
conf_ctx = axis2_conf_ctx_create(env, conf);
- AXIS2_PHASE_RESOLVER_BUILD_CHAINS(phase_resolver, env);
+ axis2_phase_resolver_build_chains(phase_resolver, env);
axis2_init_modules(env, conf_ctx);
axis2_init_transports(env, conf_ctx);
- AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env);
+ axis2_phase_resolver_free(phase_resolver, env);
return conf_ctx;
}
@@ -114,12 +114,12 @@
return NULL;
}
- AXIS2_PHASE_RESOLVER_BUILD_CHAINS(phase_resolver, env);
+ axis2_phase_resolver_build_chains(phase_resolver, env);
axis2_init_modules(env, conf_ctx);
axis2_init_transports(env, conf_ctx);
- AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env);
+ axis2_phase_resolver_free(phase_resolver, env);
return conf_ctx;
}
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=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Mar 19 12:24:52 2007
@@ -522,7 +522,7 @@
axis2_module_t *module = NULL;
axis2_status_t status = AXIS2_FAILURE;
- status = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_OP(pr, env,
+ status = axis2_phase_resolver_engage_module_to_op(pr, env,
op, moduleref);
if (AXIS2_SUCCESS != status)
{
@@ -540,7 +540,7 @@
{
return AXIS2_FAILURE;
}
- AXIS2_PHASE_RESOLVER_FREE(pr, env);
+ axis2_phase_resolver_free(pr, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Mon Mar 19 12:24:52 2007
@@ -691,7 +691,7 @@
{
return AXIS2_FAILURE;
}
- status = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_SVC(phase_resolver, env, svc,
+ status = axis2_phase_resolver_engage_module_to_svc(phase_resolver, env, svc,
module_desc);
if (status)
{
@@ -702,7 +702,7 @@
}
if (phase_resolver)
{
- AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env);
+ axis2_phase_resolver_free(phase_resolver, env);
phase_resolver = NULL;
}
@@ -776,7 +776,7 @@
{
if (pr)
{
- AXIS2_PHASE_RESOLVER_FREE(pr, env);
+ axis2_phase_resolver_free(pr, env);
pr = NULL;
}
return AXIS2_FAILURE;
@@ -791,20 +791,20 @@
{
if (pr)
{
- AXIS2_PHASE_RESOLVER_FREE(pr, env);
+ axis2_phase_resolver_free(pr, env);
pr = NULL;
}
return status;
}
}
- status = AXIS2_PHASE_RESOLVER_BUILD_MODULE_OP(pr, env, op_desc);
+ status = axis2_phase_resolver_build_module_op(pr, env, op_desc);
if (AXIS2_SUCCESS != status)
{
if (pr)
{
- AXIS2_PHASE_RESOLVER_FREE(pr, env);
+ axis2_phase_resolver_free(pr, env);
pr = NULL;
}
return status;
@@ -815,7 +815,7 @@
{
if (pr)
{
- AXIS2_PHASE_RESOLVER_FREE(pr, env);
+ axis2_phase_resolver_free(pr, env);
pr = NULL;
}
return status;
@@ -825,7 +825,7 @@
if (pr)
{
- AXIS2_PHASE_RESOLVER_FREE(pr, env);
+ axis2_phase_resolver_free(pr, env);
pr = NULL;
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?view=diff&rev=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Mon Mar 19 12:24:52 2007
@@ -214,12 +214,12 @@
return AXIS2_FAILURE;
}
- status = AXIS2_PHASE_RESOLVER_BUILD_CHAINS(handler_resolver, env);
+ status = axis2_phase_resolver_build_chains(handler_resolver, env);
if (AXIS2_SUCCESS != status)
{
/* remove the previously added service */
axis2_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
- AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
+ axis2_phase_resolver_free(handler_resolver, env);
return status;
}
@@ -228,7 +228,7 @@
{
/* remove the previously added service */
axis2_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
- AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
+ axis2_phase_resolver_free(handler_resolver, env);
return status;
}
@@ -237,11 +237,11 @@
{
/* remove the previously added service */
axis2_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
- AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
+ axis2_phase_resolver_free(handler_resolver, env);
return status;
}
- AXIS2_PHASE_RESOLVER_FREE(handler_resolver, env);
+ axis2_phase_resolver_free(handler_resolver, env);
return status;
}
@@ -478,13 +478,13 @@
/* engage in per each service */
axis2_hash_this(index, NULL, NULL, &v);
axis_svc = (axis2_svc_t *) v;
- status = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_SVC(phase_resolver,
+ status = axis2_phase_resolver_engage_module_to_svc(phase_resolver,
env, axis_svc, module);
if (!status)
{
if (phase_resolver)
{
- AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env);
+ axis2_phase_resolver_free(phase_resolver, env);
}
return status;
}
@@ -493,7 +493,7 @@
}
if (phase_resolver)
{
- AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env);
+ axis2_phase_resolver_free(phase_resolver, env);
}
return axis2_svc_grp_add_module_qname(svc_grp, env, module_name);
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=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Mar 19 12:24:52 2007
@@ -1373,9 +1373,9 @@
return AXIS2_FAILURE;
}
- status = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_GLOBALLY(phase_resolver, env,
+ status = axis2_phase_resolver_engage_module_globally(phase_resolver, env,
module_desc);
- AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env);
+ axis2_phase_resolver_free(phase_resolver, env);
if (!status)
{
return status;
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=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Mon Mar 19 12:24:52 2007
@@ -23,15 +23,14 @@
};
AXIS2_EXTERN axis2_phase_holder_t *AXIS2_CALL
-axis2_phase_holder_create(
- const axis2_env_t *env)
+axis2_phase_holder_create(const axis2_env_t *env)
{
axis2_phase_holder_t *phase_holder = NULL;
AXIS2_ENV_CHECK(env, NULL);
phase_holder = (axis2_phase_holder_t *) AXIS2_MALLOC(env->
- allocator, sizeof(axis2_phase_holder_t));
+ allocator, sizeof(axis2_phase_holder_t));
if (! phase_holder)
{
@@ -45,8 +44,7 @@
}
AXIS2_EXTERN axis2_phase_holder_t *AXIS2_CALL
-axis2_phase_holder_create_with_phases(
- const axis2_env_t *env,
+axis2_phase_holder_create_with_phases(const axis2_env_t *env,
axis2_array_list_t *phases)
{
axis2_phase_holder_t *phase_holder = NULL;
@@ -54,7 +52,9 @@
AXIS2_ENV_CHECK(env, NULL);
if (!phases)
+ {
return NULL;
+ }
phase_holder = (axis2_phase_holder_t *)axis2_phase_holder_create(env);
phase_holder->phase_list = phases;
@@ -63,8 +63,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phase_holder_free(
- axis2_phase_holder_t *phase_holder,
+axis2_phase_holder_free(axis2_phase_holder_t *phase_holder,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -78,8 +77,7 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_phase_holder_is_phase_exist(
- axis2_phase_holder_t *phase_holder,
+axis2_phase_holder_is_phase_exist(axis2_phase_holder_t *phase_holder,
const axis2_env_t *env,
const axis2_char_t *phase_name)
{
@@ -97,7 +95,7 @@
const axis2_char_t *phase_name_l = NULL;
phase = (axis2_phase_t *) axis2_array_list_get(phase_holder->
- phase_list, env, i);
+ phase_list, env, i);
phase_name_l = AXIS2_PHASE_GET_NAME(phase, env);
if (0 == axis2_strcmp(phase_name_l, phase_name))
{
@@ -108,8 +106,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phase_holder_add_handler(
- axis2_phase_holder_t *phase_holder,
+axis2_phase_holder_add_handler(axis2_phase_holder_t *phase_holder,
const axis2_env_t *env,
axis2_handler_desc_t *handler)
{
@@ -121,17 +118,17 @@
AXIS2_PARAM_CHECK(env->error, handler, AXIS2_FAILURE);
phase_name = axis2_phase_rule_get_name(
- axis2_handler_desc_get_rules(handler, env), env);
+ axis2_handler_desc_get_rules(handler, env), env);
if (AXIS2_TRUE == axis2_phase_holder_is_phase_exist(phase_holder, env,
- phase_name))
+ phase_name))
{
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);
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);
+ axis2_string_get_buffer(axis2_handler_desc_get_name(handler, env), env),
+ phase_name);
}
else
{
@@ -139,13 +136,12 @@
status = AXIS2_FAILURE;
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "axis2_phase_holder_add_handler end status = %s",
- status ? "SUCCESS" : "FAILURE");
+ status ? "SUCCESS" : "FAILURE");
return status;
}
AXIS2_EXTERN axis2_phase_t *AXIS2_CALL
-axis2_phase_holder_get_phase(
- const axis2_phase_holder_t *phase_holder,
+axis2_phase_holder_get_phase(const axis2_phase_holder_t *phase_holder,
const axis2_env_t *env,
const axis2_char_t *phase_name)
{
@@ -153,7 +149,6 @@
int i = 0;
axis2_phase_t *phase = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, phase_name, NULL);
size = axis2_array_list_size(phase_holder->phase_list, env);
@@ -162,7 +157,7 @@
{
const axis2_char_t *phase_name_l = NULL;
phase = (axis2_phase_t *) axis2_array_list_get(phase_holder->
- phase_list, env, i);
+ phase_list, env, i);
phase_name_l = AXIS2_PHASE_GET_NAME(phase, env);
if (0 == axis2_strcmp(phase_name_l, phase_name))
{
@@ -174,8 +169,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phase_holder_build_transport_handler_chain(
- axis2_phase_holder_t *phase_holder,
+axis2_phase_holder_build_transport_handler_chain(axis2_phase_holder_t *phase_holder,
const axis2_env_t *env,
axis2_phase_t *phase,
axis2_array_list_t *handlers)
@@ -195,14 +189,18 @@
for (i = 0; i < size; i++)
{
handler_desc = (axis2_handler_desc_t *) axis2_array_list_get(
- handlers, env, i);
+ handlers, env, i);
status = AXIS2_HANDLER_INIT(handler, env, handler_desc);
if (AXIS2_FAILURE == status)
+ {
return status;
+ }
status = axis2_handler_desc_set_handler(handler_desc, env, handler);
if (AXIS2_FAILURE == status)
+ {
return status;
+ }
status = AXIS2_PHASE_ADD_HANDLER(phase, env, handler);
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Mon Mar 19 12:24:52 2007
@@ -61,7 +61,7 @@
AXIS2_ENV_CHECK(env, NULL);
phase_resolver = (axis2_phase_resolver_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_phase_resolver_t));
+ sizeof(axis2_phase_resolver_t));
if (! phase_resolver)
{
@@ -86,7 +86,7 @@
AXIS2_PARAM_CHECK(env->error, axis2_config, NULL);
phase_resolver = (axis2_phase_resolver_t *)
- axis2_phase_resolver_create(env);
+ axis2_phase_resolver_create(env);
phase_resolver->axis2_config = axis2_config;
@@ -105,7 +105,7 @@
AXIS2_PARAM_CHECK(env->error, axis2_config, NULL);
phase_resolver = (axis2_phase_resolver_t *)
- axis2_phase_resolver_create(env);
+ axis2_phase_resolver_create(env);
if (!phase_resolver)
{
@@ -115,7 +115,7 @@
phase_resolver->svc = svc;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "svc name is:%s",
- AXIS2_SVC_GET_NAME(phase_resolver->svc, env));
+ AXIS2_SVC_GET_NAME(phase_resolver->svc, env));
return phase_resolver;
}
@@ -151,7 +151,7 @@
ops = AXIS2_SVC_GET_ALL_OPS(phase_resolver->svc, env);
for (index_i = axis2_hash_first(ops, env); index_i; index_i =
- axis2_hash_next(env, index_i))
+ axis2_hash_next(env, index_i))
{
void *v = NULL;
int j = 0;
@@ -160,7 +160,7 @@
for (j = 1; j < 5; j++)
{
status = axis2_phase_resolver_build_execution_chains(phase_resolver,
- env, j, op);
+ env, j, op);
}
}
@@ -180,14 +180,16 @@
AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
- axis2_qname_get_localpart(axis2_op_get_qname(op, env),
- env));
+ axis2_qname_get_localpart(axis2_op_get_qname(op, env),
+ env));
for (i = 1; i < 5; i++)
{
status = axis2_phase_resolver_build_execution_chains(phase_resolver,
- env, i, op);
+ env, i, op);
if(!status)
+ {
break;
+ }
}
return status;
}
@@ -205,13 +207,12 @@
int size = 0;
int status = AXIS2_FAILURE;
axis2_flow_t *flow = NULL;
- /*axis2_property_t *property = NULL;*/
axis2_phase_holder_t *phase_holder = NULL;
/* engage handlers from axis2.xml from modules */
moduleqnames = axis2_conf_get_all_engaged_modules(
- phase_resolver->axis2_config, env);
+ phase_resolver->axis2_config, env);
size = axis2_array_list_size(moduleqnames, env);
status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -226,11 +227,11 @@
axis2_module_desc_t *module_desc = NULL;
modulename = (axis2_qname_t *) axis2_array_list_get(moduleqnames, env,
- i);
+ i);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "module name is:%s",
- axis2_qname_get_localpart(modulename, env));
+ axis2_qname_get_localpart(modulename, env));
module_desc = axis2_conf_get_module(phase_resolver->axis2_config, env,
- modulename);
+ modulename);
if (module_desc)
{
switch (type)
@@ -256,12 +257,6 @@
break;
}
}
- /*status = AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(phase_resolver->svc,
- env, module_desc);
- if (AXIS2_SUCCESS != status)
- {
- return status;
- }*/
status = axis2_op_add_to_engaged_module_list(op, env, module_desc);
if (AXIS2_SUCCESS != status)
{
@@ -271,9 +266,8 @@
}
else
{
-
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MODULE_REF,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -302,15 +296,17 @@
return AXIS2_FAILURE;
}
if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
if (!all_handlers)
{
all_handlers = axis2_array_list_create(env, 0);
if (!all_handlers)
+ {
return AXIS2_FAILURE;
+ }
}
status = axis2_array_list_add(all_handlers, env, metadata);
if (AXIS2_SUCCESS != status)
@@ -326,9 +322,9 @@
else
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "This handler is\
- trying to added to system pre defined phases , but those\
- handlers are already added to global chain which run\
- irrespective of the service");
+ trying to added to system pre defined phases , but those\
+ handlers are already added to global chain which run\
+ irrespective of the service");
}
}
}
@@ -338,47 +334,6 @@
/* process handlers form service.xml */
flow = NULL;
- /*switch (type)
- {
-
- case AXIS2_IN_FLOW:
- {
-
- property = (axis2_property_t *)
- AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(phase_resolver->
- svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FLOW_KEY);
- if (property)
- flow = (axis2_flow_t *) axis2_property_get_value(property, env);
- break;
- }
- case AXIS2_OUT_FLOW:
- {
- property = (axis2_property_t *)
- AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(phase_resolver->
- svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FLOW_KEY);
- if (property)
- flow = (axis2_flow_t *) axis2_property_get_value(property, env);
- break;
- }
- case AXIS2_FAULT_IN_FLOW:
- {
- property = (axis2_property_t *)
- AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(phase_resolver->
- svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY);
- if (property)
- flow = (axis2_flow_t *) axis2_property_get_value(property, env);
- break;
- }
- case AXIS2_FAULT_OUT_FLOW:
- {
- property = (axis2_property_t *)
- AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(phase_resolver->
- svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY);
- if (property)
- flow = (axis2_flow_t *) axis2_property_get_value(property, env);
- break;
- }
- }*/
if (flow)
{
@@ -412,14 +367,14 @@
if (!phase_name || (0 == axis2_strcmp(phase_name, "")))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PHASE_IS_NOT_SPECIFED,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
else if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
if (all_handlers)
{
@@ -427,7 +382,7 @@
all_handlers = NULL;
}
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE, AXIS2_FAILURE);
+ AXIS2_ERROR_SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -437,7 +392,9 @@
{
all_handlers = axis2_array_list_create(env, 0);
if (!all_handlers)
+ {
return AXIS2_FAILURE;
+ }
}
status = axis2_array_list_add(all_handlers, env, metadata);
@@ -454,7 +411,7 @@
axis2_handler_desc_t *handler_desc = NULL;
handler_desc = axis2_array_list_get(all_handlers,
- env, i);
+ env, i);
axis2_handler_desc_free(handler_desc, env);
}
axis2_array_list_free(all_handlers, env);
@@ -523,21 +480,27 @@
axis2_handler_desc_t *metadata = NULL;
metadata = (axis2_handler_desc_t *)
- axis2_array_list_get(all_handlers, env, i);
+ axis2_array_list_get(all_handlers, env, i);
if (phase_holder)
{
- status = AXIS2_PHASE_HOLDER_ADD_HANDLER(phase_holder,
- env, metadata);
+ status = axis2_phase_holder_add_handler(phase_holder,
+ env, metadata);
if(!status)
+ {
break;
+ }
}
}
/* Free the locally created all_handlers list */
if (all_handlers)
+ {
axis2_array_list_free(all_handlers, env);
+ }
if(phase_holder)
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ {
+ axis2_phase_holder_free(phase_holder, env);
+ }
return status;
}
@@ -555,20 +518,20 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
transports_in = axis2_conf_get_all_in_transports(phase_resolver->axis2_config,
- env);
+ env);
if (!transports_in)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_TRANSPORT_IN_CONFIGURED,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_SUCCESS;
}
transports_out = axis2_conf_get_all_out_transports(phase_resolver->axis2_config,
- env);
+ env);
if (!transports_out)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_TRANSPORT_OUT_CONFIGURED,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_SUCCESS;
}
@@ -657,7 +620,7 @@
if (rule)
{
status = axis2_phase_rule_set_name(rule, env,
- AXIS2_TRANSPORT_PHASE);
+ AXIS2_TRANSPORT_PHASE);
}
if (AXIS2_SUCCESS != status)
{
@@ -715,15 +678,15 @@
axis2_array_list_free(handlers, env);
}
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- status = AXIS2_PHASE_HOLDER_BUILD_TRANSPORT_HANDLER_CHAIN(
- phase_holder, env, phase, handlers);
+ status = axis2_phase_holder_build_transport_handler_chain(
+ phase_holder, env, phase, handlers);
if (phase_holder)
{
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ axis2_phase_holder_free(phase_holder, env);
}
}
else
@@ -795,7 +758,7 @@
if (rule)
{
status = axis2_phase_rule_set_name(rule, env,
- AXIS2_TRANSPORT_PHASE);
+ AXIS2_TRANSPORT_PHASE);
}
if (AXIS2_SUCCESS != status)
{
@@ -857,10 +820,12 @@
return AXIS2_FAILURE;
}
- status = AXIS2_PHASE_HOLDER_BUILD_TRANSPORT_HANDLER_CHAIN(
- phase_holder, env, phase, handlers);
+ status = axis2_phase_holder_build_transport_handler_chain(
+ phase_holder, env, phase, handlers);
if (phase_holder)
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ {
+ axis2_phase_holder_free(phase_holder, env);
+ }
}
else
{
@@ -868,7 +833,9 @@
}
}
if (handlers)
+ {
axis2_array_list_free(handlers, env);
+ }
return status;
}
@@ -886,7 +853,7 @@
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
status = axis2_phase_resolver_engage_to_global_chain(phase_resolver, env,
- module_desc);
+ module_desc);
if (AXIS2_SUCCESS != status)
{
return status;
@@ -897,7 +864,7 @@
return AXIS2_FAILURE;
}
for (index_i = axis2_hash_first(svc_grps, env); index_i; index_i =
- axis2_hash_next(env, index_i))
+ axis2_hash_next(env, index_i))
{
axis2_hash_t *svcs = NULL;
axis2_svc_grp_t *svc_grp = NULL;
@@ -910,7 +877,7 @@
svcs = axis2_svc_grp_get_all_svcs(svc_grp, env);
for (index_j = axis2_hash_first(svcs, env); index_j; index_j =
- axis2_hash_next(env, index_j))
+ axis2_hash_next(env, index_j))
{
axis2_svc_t *svc = NULL;
void *w = NULL;
@@ -918,31 +885,26 @@
axis2_hash_this(index_j, NULL, NULL, &w);
svc = (axis2_svc_t *) w;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "svc name is:%s",
- AXIS2_SVC_GET_NAME(svc, env));
+ AXIS2_SVC_GET_NAME(svc, env));
status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc,
- phase_resolver->axis2_config);
+ phase_resolver->axis2_config);
if (AXIS2_SUCCESS != status)
{
return status;
}
status = axis2_phase_resolver_engage_module_to_svc_from_global(
- phase_resolver, env, svc, module_desc);
+ phase_resolver, env, svc, module_desc);
if (AXIS2_SUCCESS != status)
{
return status;
}
- /*status = AXIS2_SVC_ADD_TO_ENGAGED_MODULE_LIST(svc, env, module_desc);
- if (AXIS2_SUCCESS != status)
- {
- return status;
- }*/
}
mod_name = axis2_module_desc_get_qname(module_desc, env);
status = axis2_svc_grp_add_module_qname(svc_grp, env,
- mod_name);
+ mod_name);
if (AXIS2_SUCCESS != status)
{
@@ -977,7 +939,7 @@
}
for (index_i = axis2_hash_first(ops, env); index_i;
- index_i = axis2_hash_next(env, index_i))
+ index_i = axis2_hash_next(env, index_i))
{
void *v = NULL;
axis2_op_t *op_desc = NULL;
@@ -990,21 +952,23 @@
axis2_hash_this(index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "op name is:%s",
- axis2_qname_get_localpart(axis2_op_get_qname(op_desc, env), env));
+ axis2_qname_get_localpart(axis2_op_get_qname(op_desc, env), env));
modules = axis2_op_get_all_modules(op_desc, env);
module_desc_qname = axis2_module_desc_get_qname(module_desc, env);
if (modules)
+ {
size = axis2_array_list_size(modules, env);
+ }
for (j = 0; j < size; j++)
{
axis2_module_desc_t *module_desc_l = NULL;
const axis2_qname_t *module_desc_qname_l = NULL;
module_desc_l = (axis2_module_desc_t *)
- axis2_array_list_get(modules, env, j);
+ axis2_array_list_get(modules, env, j);
module_desc_qname_l = axis2_module_desc_get_qname(module_desc_l ,
- env);
+ env);
if (axis2_qname_equals(module_desc_qname_l, env, module_desc_qname))
{
engaged = AXIS2_TRUE;
@@ -1106,17 +1070,17 @@
return AXIS2_FAILURE;
}
if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
if (phase_holder)
{
- status = AXIS2_PHASE_HOLDER_ADD_HANDLER(
- phase_holder, env, metadata);
+ status = axis2_phase_holder_add_handler(
+ phase_holder, env, metadata);
if(!status)
{
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ axis2_phase_holder_free(phase_holder, env);
return status;
}
}
@@ -1125,7 +1089,9 @@
}
if(phase_holder)
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ {
+ axis2_phase_holder_free(phase_holder, env);
+ }
}
status = axis2_op_add_to_engaged_module_list(op_desc, env, module_desc);
if (AXIS2_SUCCESS != status)
@@ -1162,7 +1128,7 @@
phase_list =
axis2_conf_get_in_phases_upto_and_including_post_dispatch(
- phase_resolver->axis2_config, env);
+ phase_resolver->axis2_config, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
if (!phase_holder) continue;
@@ -1173,7 +1139,7 @@
axis2_array_list_t *phase_list = NULL;
phase_list = axis2_conf_get_out_flow(phase_resolver->axis2_config,
- env);
+ env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
if (!phase_holder) continue;
@@ -1184,7 +1150,7 @@
axis2_array_list_t *phase_list = NULL;
phase_list = axis2_conf_get_in_fault_flow(phase_resolver->
- axis2_config, env);
+ axis2_config, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
if (!phase_holder) continue;
@@ -1195,7 +1161,7 @@
axis2_array_list_t *phase_list = NULL;
phase_list = axis2_conf_get_out_fault_flow(phase_resolver->
- axis2_config, env);
+ axis2_config, env);
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
if (!phase_holder) continue;
@@ -1248,32 +1214,26 @@
return AXIS2_FAILURE;
}
if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
- status = AXIS2_PHASE_HOLDER_ADD_HANDLER(phase_holder, env,
- metadata);
+ status = axis2_phase_holder_add_handler(phase_holder, env,
+ metadata);
if (!status)
{
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ axis2_phase_holder_free(phase_holder, env);
return status;
}
}
- /*else
- {
- * These handlers will go to op's handler chains , since
- * the module try to add handlers to both system predefined
- * phases and user defined phase so global module can do
- * that. here the global module are the module which are
- * referred by axis2.xml
- }*/
}
}
if(phase_holder)
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ {
+ axis2_phase_holder_free(phase_holder, env);
+ }
}
return AXIS2_SUCCESS;
@@ -1300,7 +1260,7 @@
return AXIS2_FAILURE;
}
status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc,
- phase_resolver->axis2_config);
+ phase_resolver->axis2_config);
if (AXIS2_SUCCESS != status)
{
@@ -1308,7 +1268,7 @@
}
module_d_qname = axis2_module_desc_get_qname(module_desc, env);
for (index_i = axis2_hash_first(ops, env); index_i; index_i =
- axis2_hash_next(env, index_i))
+ axis2_hash_next(env, index_i))
{
axis2_array_list_t *modules = NULL;
axis2_op_t *op_desc = NULL;
@@ -1321,7 +1281,9 @@
op_desc = (axis2_op_t *) v;
modules = axis2_op_get_all_modules(op_desc, env);
if (modules)
+ {
size = axis2_array_list_size(modules, env);
+ }
for (j = 0; j < size; j++)
{
axis2_module_desc_t *module_desc_l = NULL;
@@ -1330,7 +1292,7 @@
module_desc_l = axis2_array_list_get(modules, env, j);
module_d_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
if (AXIS2_TRUE == axis2_qname_equals(module_d_qname, env,
- module_d_qname_l))
+ module_d_qname_l))
{
engaged = AXIS2_TRUE;
break;
@@ -1340,14 +1302,14 @@
if (AXIS2_FALSE == engaged)
{
status = axis2_phase_resolver_engage_module_to_op(
- phase_resolver, env, op_desc, module_desc);
+ phase_resolver, env, op_desc, module_desc);
if (AXIS2_SUCCESS != status)
{
return status;
}
status = axis2_op_add_to_engaged_module_list(op_desc, env,
- module_desc);
+ module_desc);
}
}
@@ -1429,7 +1391,7 @@
}
}
- if (flow && NULL != phase_holder)
+ if (flow && phase_holder)
{
int j = 0;
int handler_count = 0;
@@ -1446,42 +1408,42 @@
phase_rule = axis2_handler_desc_get_rules(metadata, env);
phase_name = axis2_phase_rule_get_name(phase_rule, env);
if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
- (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+ (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
- status = AXIS2_PHASE_HOLDER_ADD_HANDLER(phase_holder,
- env, metadata);
+ status = axis2_phase_holder_add_handler(phase_holder,
+ env, metadata);
if (AXIS2_SUCCESS != status)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Handler inclusion failed for %s phase", phase_name);
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ "Handler inclusion failed for %s phase", phase_name);
+ axis2_phase_holder_free(phase_holder, env);
return status;
}
}
if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
- (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+ (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+ (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
axis2_array_list_t *phase_list = NULL;
axis2_phase_holder_t *phase_holder = NULL;
phase_list =
axis2_conf_get_in_phases_upto_and_including_post_dispatch(
- phase_resolver->axis2_config, env);
+ phase_resolver->axis2_config, env);
if (phase_holder)
{
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ axis2_phase_holder_free(phase_holder, env);
phase_holder = NULL;
}
phase_holder =
axis2_phase_holder_create_with_phases(env, phase_list);
- status = AXIS2_PHASE_HOLDER_ADD_HANDLER(phase_holder, env, metadata);
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ status = axis2_phase_holder_add_handler(phase_holder, env, metadata);
+ axis2_phase_holder_free(phase_holder, env);
phase_holder = NULL;
if (AXIS2_SUCCESS != status)
{
@@ -1493,7 +1455,7 @@
if(phase_holder)
{
- AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
+ axis2_phase_holder_free(phase_holder, env);
phase_holder = NULL;
}
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Mon Mar 19 12:24:52 2007
@@ -100,7 +100,7 @@
if (!is_soap)
{
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(out, env);
+ soap_body = axiom_soap_envelope_get_body(out, env);
if (! soap_body)
{
AXIS2_ERROR_SET(env->error,
@@ -110,7 +110,7 @@
AXIS2_ERROR_GET_MESSAGE(env->error));
return AXIS2_FAILURE;
}
- body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+ body_node = axiom_soap_body_get_base_node(soap_body, env);
if (! body_node)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c?view=diff&rev=520053&r1=520052&r2=520053
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c Mon Mar 19 12:24:52 2007
@@ -1317,7 +1317,7 @@
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
AXIOM_SOAP11);
- soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_env, env);
+ soap_body = axiom_soap_envelope_get_body(soap_env, env);
if (! soap_body)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SOAP_ENVELOPE_OR_SOAP_BODY_NULL,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org