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 du...@apache.org on 2007/03/22 10:42:05 UTC
svn commit: r521175 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/deployment/ modules/core/engine/
Author: dushshantha
Date: Thu Mar 22 02:42:04 2007
New Revision: 521175
URL: http://svn.apache.org/viewvc?view=rev&rev=521175
Log:
removed macros and corrected indentation
Modified:
webservices/axis2/trunk/c/include/axis2_phases_info.h
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
Modified: webservices/axis2/trunk/c/include/axis2_phases_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phases_info.h?view=diff&rev=521175&r1=521174&r2=521175
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phases_info.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phases_info.h Thu Mar 22 02:42:04 2007
@@ -24,10 +24,6 @@
* @{
*/
-/**
- * @file axis2_phases_info.h
- * @brief axis2 phases info interface.
- */
#include <axis2_const.h>
#include <axis2_error.h>
#include <axis2_defines.h>
@@ -185,61 +181,61 @@
axis2_phases_info_copy_flow(const axis2_env_t *env,
const axis2_array_list_t *flow_to_copy);
-/** Frees the phases info.*/
+/** Frees the phases info.
#define AXIS2_PHASES_INFO_FREE(phases_info, env) \
- axis2_phases_info_free (phases_info, env)
+ axis2_phases_info_free (phases_info, env)*/
-/** Sets the in phases. */
+/** Sets the in phases.
#define AXIS2_PHASES_INFO_SET_IN_PHASES(phases_info, env, in_phases) \
- axis2_phases_info_set_in_phases(phases_info, env, in_phases)
+ axis2_phases_info_set_in_phases(phases_info, env, in_phases)*/
-/** Sets the out phases. */
+/** Sets the out phases.
#define AXIS2_PHASES_INFO_SET_OUT_PHASES(phases_info, env, out_phases) \
- axis2_phases_info_set_out_phases(phases_info, env, out_phases)
+ axis2_phases_info_set_out_phases(phases_info, env, out_phases)*/
-/** Sets the in fault phases. */
+/** Sets the in fault phases.
#define AXIS2_PHASES_INFO_SET_IN_FAULTPHASES(phases_info, env, in_faultphases) \
- axis2_phases_info_set_in_faultphases(phases_info, env, in_faultphases)
+ axis2_phases_info_set_in_faultphases(phases_info, env, in_faultphases)*/
-/** Sets the out fault phases. */
+/** Sets the out fault phases.
#define AXIS2_PHASES_INFO_SET_OUT_FAULTPHASES(phases_info, env, out_faultphases) \
- axis2_phases_info_set_out_faultphases(phases_info, env, out_faultphases)
+ axis2_phases_info_set_out_faultphases(phases_info, env, out_faultphases)*/
-/** Gets the in phases. */
+/** Gets the in phases.
#define AXIS2_PHASES_INFO_GET_IN_PHASES(phases_info, env) \
- axis2_phases_info_get_in_phases(phases_info, env)
+ axis2_phases_info_get_in_phases(phases_info, env)*/
-/** Gets the out phases. */
+/** Gets the out phases.
#define AXIS2_PHASES_INFO_GET_OUT_PHASES(phases_info, env) \
- axis2_phases_info_get_out_phases(phases_info, env)
+ axis2_phases_info_get_out_phases(phases_info, env)*/
-/** Gets the in fault phases. */
+/** Gets the in fault phases.
#define AXIS2_PHASES_INFO_GET_IN_FAULTPHASES(phases_info, env) \
- axis2_phases_info_get_in_faultphases(phases_info, env)
+ axis2_phases_info_get_in_faultphases(phases_info, env)*/
-/** Gets the out fault phases. */
+/** Gets the out fault phases.
#define AXIS2_PHASES_INFO_GET_OUT_FAULTPHASES(phases_info, env) \
- axis2_phases_info_get_out_faultphases(phases_info, env)
+ axis2_phases_info_get_out_faultphases(phases_info, env)*/
-/** Gets the op in phases. */
+/** Gets the op in phases.
#define AXIS2_PHASES_INFO_GET_OP_IN_PHASES(phases_info, env) \
- axis2_phases_info_get_op_in_phases(phases_info, env)
+ axis2_phases_info_get_op_in_phases(phases_info, env)*/
-/** Gets the op out phases. */
+/** Gets the op out phases.
#define AXIS2_PHASES_INFO_GET_OP_OUT_PHASES(phases_info, env) \
- axis2_phases_info_get_op_out_phases(phases_info, env)
+ axis2_phases_info_get_op_out_phases(phases_info, env)*/
-/** Gets the op in fault phases. */
+/** Gets the op in fault phases.
#define AXIS2_PHASES_INFO_GET_OP_IN_FAULTPHASES(phases_info, env) \
- axis2_phases_info_get_op_in_faultphases(phases_info, env)
+ axis2_phases_info_get_op_in_faultphases(phases_info, env)*/
-/** Gets the op out fault phases. */
+/** Gets the op out fault phases.
#define AXIS2_PHASES_INFO_GET_OP_OUT_FAULTPHASES(phases_info, env) \
- axis2_phases_info_get_op_out_faultphases(phases_info, env)
+ axis2_phases_info_get_op_out_faultphases(phases_info, env)*/
-/** Sets the op phases. */
+/** Sets the op phases.
#define AXIS2_PHASES_INFO_SET_OP_PHASES(phases_info, env, axis2_opt) \
- axis2_phases_info_set_op_phases(phases_info, env, axis2_opt)
+ axis2_phases_info_set_op_phases(phases_info, env, axis2_opt)*/
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=521175&r1=521174&r2=521175
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Thu Mar 22 02:42:04 2007
@@ -174,7 +174,7 @@
/* Setting operation phase */
info = axis2_conf_get_phases_info(svc_client->conf, env);
- AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
+ axis2_phases_info_set_op_phases(info, env, op);
}
}
else
@@ -457,12 +457,12 @@
return AXIS2_FAILURE;
size = axis2_array_list_size(svc_client->headers, env);
-
+
for (i = 0; i < size; i++)
{
axiom_node_t *node = NULL;
node = axis2_array_list_get(svc_client->headers, env, i);
-
+
if (node)
{
AXIOM_NODE_FREE_TREE(node, env);
@@ -682,7 +682,7 @@
msg_ctx = axis2_msg_ctx_create(env,
axis2_svc_ctx_get_conf_ctx(svc_client->svc_ctx, env), NULL, NULL);
AXIS2_OP_CLIENT_ADD_MSG_CTX(svc_client->op_client, env, msg_ctx);
-
+
axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
/* end of hack to get rid of memory leak */
@@ -719,7 +719,7 @@
AXIS2_OP_CLIENT_EXECUTE(svc_client->op_client, env, AXIS2_TRUE);
res_msg_ctx = (axis2_msg_ctx_t *)AXIS2_OP_CLIENT_GET_MSG_CTX(
svc_client->op_client, env, AXIS2_WSDL_MESSAGE_LABEL_IN);
-
+
if (res_msg_ctx)
soap_envelope = axis2_msg_ctx_get_soap_envelope(res_msg_ctx, env);
else
@@ -1108,9 +1108,9 @@
/* Setting operation phase */
info = axis2_conf_get_phases_info(svc_client->conf, env);
- AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_out_in);
- AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_out_only);
- AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_robust_out_only);
+ axis2_phases_info_set_op_phases(info, env, op_out_in);
+ axis2_phases_info_set_op_phases(info, env, op_out_only);
+ axis2_phases_info_set_op_phases(info, env, op_robust_out_only);
AXIS2_SVC_ADD_OP(svc, env, op_out_in);
AXIS2_SVC_ADD_OP(svc, env, op_out_only);
AXIS2_SVC_ADD_OP(svc, env, op_robust_out_only);
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=521175&r1=521174&r2=521175
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Thu Mar 22 02:42:04 2007
@@ -510,19 +510,19 @@
}
if (flow_type && 0 == axis2_strcmp(AXIS2_IN_FLOW_START, flow_type))
{
- AXIS2_PHASES_INFO_SET_IN_PHASES(info, env, phase_list);
+ axis2_phases_info_set_in_phases(info, env, phase_list);
}
else if (flow_type && 0 == axis2_strcmp(AXIS2_IN_FAILTFLOW, flow_type))
{
- AXIS2_PHASES_INFO_SET_IN_FAULTPHASES(info, env, phase_list);
+ axis2_phases_info_set_in_faultphases(info, env, phase_list);
}
else if (flow_type && 0 == axis2_strcmp(AXIS2_OUT_FLOW_START, flow_type))
{
- AXIS2_PHASES_INFO_SET_OUT_PHASES(info, env, phase_list);
+ axis2_phases_info_set_out_phases(info, env, phase_list);
}
else if (flow_type && 0 == axis2_strcmp(AXIS2_OUT_FAILTFLOW, flow_type))
{
- AXIS2_PHASES_INFO_SET_OUT_FAULTPHASES(info, env, phase_list);
+ axis2_phases_info_set_out_faultphases(info, env, phase_list);
}
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=521175&r1=521174&r2=521175
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Mar 22 02:42:04 2007
@@ -288,7 +288,7 @@
if (dep_engine->phases_info)
{
- AXIS2_PHASES_INFO_FREE(dep_engine->phases_info, env);
+ axis2_phases_info_free(dep_engine->phases_info, env);
}
if (dep_engine->conf_builder)
@@ -652,7 +652,7 @@
status = axis2_conf_set_phases_info(dep_engine->conf, env,
dep_engine->phases_info);
out_fault_phases =
- AXIS2_PHASES_INFO_GET_OP_OUT_FAULTPHASES(dep_engine->phases_info, env);
+ axis2_phases_info_get_op_out_faultphases(dep_engine->phases_info, env);
new_out_fault_phases = axis2_phases_info_copy_flow(env, out_fault_phases);
if (out_fault_phases)
{
@@ -854,7 +854,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- in_phases = AXIS2_PHASES_INFO_GET_IN_PHASES(dep_engine->phases_info, env);
+ in_phases = axis2_phases_info_get_in_phases(dep_engine->phases_info, env);
/* TODO condition checking should be otherway since null value can occur */
if (in_phases)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=521175&r1=521174&r2=521175
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Thu Mar 22 02:42:04 2007
@@ -473,7 +473,7 @@
info = axis2_dep_engine_get_phases_info(
axis2_desc_builder_get_dep_engine(module_builder->desc_builder, env),
env);
- AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_desc);
+ axis2_phases_info_set_op_phases(info, env, op_desc);
/* adding operation */
axis2_array_list_add(ops, env, op_desc);
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=521175&r1=521174&r2=521175
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Thu Mar 22 02:42:04 2007
@@ -31,14 +31,13 @@
};
AXIS2_EXTERN axis2_phases_info_t *AXIS2_CALL
-axis2_phases_info_create(
- const axis2_env_t *env)
+axis2_phases_info_create(const axis2_env_t *env)
{
axis2_phases_info_t *phases_info = NULL;
AXIS2_ENV_CHECK(env, NULL);
phases_info = (axis2_phases_info_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_phases_info_t));
+ sizeof(axis2_phases_info_t));
if (! phases_info)
{
@@ -59,8 +58,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phases_info_free(
- axis2_phases_info_t *phases_info,
+axis2_phases_info_free(axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -88,7 +86,7 @@
{
axis2_hash_index_t *i = NULL;
for (i = axis2_hash_first (phases_info->op_in_phases, env); i; i =
- axis2_hash_next (env, i))
+ axis2_hash_next (env, i))
{
void *v = NULL;
axis2_phase_t *phase = NULL;
@@ -106,7 +104,7 @@
{
axis2_hash_index_t *i = NULL;
for (i = axis2_hash_first (phases_info->op_out_phases, env); i; i =
- axis2_hash_next (env, i))
+ axis2_hash_next (env, i))
{
void *v = NULL;
axis2_phase_t *phase = NULL;
@@ -166,8 +164,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phases_info_set_in_phases(
- axis2_phases_info_t *phases_info,
+axis2_phases_info_set_in_phases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
axis2_array_list_t *in_phases)
{
@@ -184,8 +181,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phases_info_set_out_phases(
- axis2_phases_info_t *phases_info,
+axis2_phases_info_set_out_phases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
axis2_array_list_t *out_phases)
{
@@ -202,8 +198,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phases_info_set_in_faultphases(
- axis2_phases_info_t *phases_info,
+axis2_phases_info_set_in_faultphases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
axis2_array_list_t *in_faultphases)
{
@@ -220,8 +215,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phases_info_set_out_faultphases(
- axis2_phases_info_t *phases_info,
+axis2_phases_info_set_out_faultphases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
axis2_array_list_t *out_faultphases)
{
@@ -238,8 +232,7 @@
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_get_in_phases(
- const axis2_phases_info_t *phases_info,
+axis2_phases_info_get_in_phases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -248,32 +241,28 @@
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_get_out_phases(
- const axis2_phases_info_t *phases_info,
+axis2_phases_info_get_out_phases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
return phases_info->out_phases;
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_get_in_faultphases(
- const axis2_phases_info_t *phases_info,
+axis2_phases_info_get_in_faultphases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
return phases_info->in_faultphases;
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_get_out_faultphases(
- const axis2_phases_info_t *phases_info,
+axis2_phases_info_get_out_faultphases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
return phases_info->out_faultphases;
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_get_op_in_phases(
- const axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_in_phases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
struct axis2_phase *phase = NULL;
@@ -291,24 +280,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- /*phase = axis2_hash_get(phases_info->op_in_phases,
- AXIS2_PHASE_POLICY_DETERMINATION, AXIS2_HASH_KEY_STRING);
- if(!phase)
- {
- phase = axis2_phase_create(env, AXIS2_PHASE_POLICY_DETERMINATION);
- axis2_hash_set(phases_info->op_in_phases,
- AXIS2_PHASE_POLICY_DETERMINATION, AXIS2_HASH_KEY_STRING, phase);
- }
-
- status = axis2_array_list_add(op_in_phases, env, phase);
- if (AXIS2_SUCCESS != status)
- {
- axis2_phase_free(phase, env);
- phase = NULL;
- axis2_array_list_free(op_in_phases, env);
- op_in_phases = NULL;
- return NULL;
- }*/
+
if (!phases_info->in_phases)
{
return op_in_phases;
@@ -316,8 +288,8 @@
size = axis2_array_list_size(phases_info->in_phases, env);
for (i = 0; i < size; i++)
{
- phase_name = (axis2_char_t *) axis2_array_list_get(
- phases_info->in_phases, env, i);
+ phase_name = (axis2_char_t *)
+ axis2_array_list_get(phases_info->in_phases, env, i);
if (0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name) ||
0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||
0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name) ||
@@ -360,8 +332,7 @@
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_get_op_out_phases(
- const axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_out_phases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
struct axis2_phase *phase = NULL;
@@ -374,7 +345,9 @@
AXIS2_ENV_CHECK(env, NULL);
if (phases_info->out_phases)
+ {
size = axis2_array_list_size(phases_info->out_phases, env);
+ }
op_out_phases = axis2_array_list_create(env, 0);
if (!op_out_phases)
{
@@ -384,7 +357,7 @@
for (i = 0; i < size; i++)
{
phase_name = (axis2_char_t *) axis2_array_list_get(phases_info->
- out_phases, env, i);
+ out_phases, env, i);
phase = axis2_hash_get(phases_info->op_out_phases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
@@ -399,7 +372,7 @@
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++)
@@ -413,72 +386,11 @@
return NULL;
}
}
- /*phase = axis2_hash_get(phases_info->op_out_phases,
- AXIS2_PHASE_POLICY_DETERMINATION, AXIS2_HASH_KEY_STRING);
- if(!phase)
- {
- phase = axis2_phase_create(env, AXIS2_PHASE_POLICY_DETERMINATION);
- axis2_hash_set(phases_info->op_out_phases,
- AXIS2_PHASE_POLICY_DETERMINATION, AXIS2_HASH_KEY_STRING, phase);
- }
- status = axis2_array_list_add(op_out_phases, env, phase);
- if (AXIS2_SUCCESS != status)
- {
- int i = 0;
- int size = 0;
-
- 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);
- phase = NULL;
- }
- axis2_array_list_free(op_out_phases, env);
- op_out_phases = NULL;
- return NULL;
- }
- phase = axis2_hash_get(phases_info->op_out_phases,
- AXIS2_PHASE_MESSAGE_OUT, AXIS2_HASH_KEY_STRING);
- if(!phase)
- {
- phase = axis2_phase_create(env, AXIS2_PHASE_MESSAGE_OUT);
- axis2_hash_set(phases_info->op_out_phases,
- AXIS2_PHASE_MESSAGE_OUT, AXIS2_HASH_KEY_STRING, phase);
- }
-
- if(phase)
- {
- status = axis2_array_list_add(op_out_phases, env, phase);
- }
-
- if (AXIS2_SUCCESS != status || !phase)
- {
- int i = 0;
- int size = 0;
-
- 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);
- phase = NULL;
- }
- axis2_array_list_free(op_out_phases, env);
- op_out_phases = NULL;
- return NULL;
-
- }*/
return op_out_phases;
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_get_op_in_faultphases(
- const axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_in_faultphases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
int i = 0;
@@ -507,8 +419,8 @@
}
for (i = 0; i < size; i++)
{
- phase_name = (axis2_char_t *) axis2_array_list_get(phases_info->
- in_faultphases, env, i);
+ phase_name = (axis2_char_t *)
+ axis2_array_list_get(phases_info->in_faultphases, env, i);
phase = axis2_hash_get(phases_info->op_in_faultphases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
@@ -523,13 +435,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);
@@ -542,8 +454,7 @@
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_get_op_out_faultphases(
- const axis2_phases_info_t *phases_info,
+axis2_phases_info_get_op_out_faultphases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
int i = 0;
@@ -560,9 +471,11 @@
return NULL;
}
size = axis2_array_list_size(phases_info->out_faultphases, env);
-
+
if (0 == size)
+ {
return NULL;
+ }
op_out_faultphases = axis2_array_list_create(env, 0);
if (!op_out_faultphases)
{
@@ -571,8 +484,8 @@
}
for (i = 0; i < size; i++)
{
- phase_name = (axis2_char_t *) axis2_array_list_get(phases_info->
- out_faultphases, env, i);
+ phase_name = (axis2_char_t *)
+ axis2_array_list_get(phases_info->out_faultphases, env, i);
phase = axis2_hash_get(phases_info->op_out_faultphases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
@@ -587,13 +500,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);
@@ -606,8 +519,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_phases_info_set_op_phases(
- axis2_phases_info_t *phases_info,
+axis2_phases_info_set_op_phases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
axis2_op_t *op_desc)
{
@@ -638,53 +550,34 @@
op_in_faultphases = axis2_phases_info_get_op_in_faultphases(phases_info, env);
op_out_faultphases = axis2_phases_info_get_op_out_faultphases(phases_info,
- env);
+ env);
status = axis2_op_set_in_flow(op_desc, env, op_in_phases);
status = axis2_op_set_out_flow(op_desc, env, op_out_phases);
if (op_in_faultphases)
{
status = axis2_op_set_fault_in_flow(op_desc, env,
- op_in_faultphases);
- }
- /*
- else
- {
- status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
- if (AXIS2_SUCCESS != status)
- {
- return status;
- }
+ op_in_faultphases);
}
- */
+
if (op_out_faultphases)
{
status = axis2_op_set_fault_out_flow(op_desc, env,
op_out_faultphases);
}
- /*
- else
- {
- status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
- if (AXIS2_SUCCESS != status)
- {
- return status;
- }
- }
- */
return status;
-
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_phases_info_copy_flow(
- const axis2_env_t *env,
+axis2_phases_info_copy_flow(const axis2_env_t *env,
const axis2_array_list_t *flow_to_copy)
{
int size = 0, i = 0;
axis2_array_list_t *new_flow = NULL;
if(flow_to_copy)
+ {
size = axis2_array_list_size((axis2_array_list_t *) flow_to_copy, env);
+ }
if(size > 0)
{
new_flow = axis2_array_list_create(env, 0);
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=521175&r1=521174&r2=521175
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Mar 22 02:42:04 2007
@@ -585,7 +585,7 @@
{
axis2_phases_info_t *info = axis2_dep_engine_get_phases_info(
dep_engine, env);
- AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_desc);
+ axis2_phases_info_set_op_phases(info, env, op_desc);
}
/* adding operation */
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=521175&r1=521174&r2=521175
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Thu Mar 22 02:42:04 2007
@@ -995,7 +995,7 @@
if (conf->phases_info)
{
- AXIS2_PHASES_INFO_FREE(phases_info, env);
+ axis2_phases_info_free(phases_info, env);
conf->phases_info = NULL;
}
conf->phases_info = phases_info;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org