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 da...@apache.org on 2008/03/25 09:11:34 UTC
svn commit: r640736 - in /webservices/axis2/trunk/c/src/core/description:
desc.c flow.c flow_container.c handler_desc.c svc_grp.c transport_in_desc.c
transport_out_desc.c
Author: damitha
Date: Tue Mar 25 01:11:32 2008
New Revision: 640736
URL: http://svn.apache.org/viewvc?rev=640736&view=rev
Log:
Adding meaningful log messages, modifying log messages to be meaningful, coding conventions.:
Also adding code comments, removing garbage.
Modified:
webservices/axis2/trunk/c/src/core/description/desc.c
webservices/axis2/trunk/c/src/core/description/flow.c
webservices/axis2/trunk/c/src/core/description/flow_container.c
webservices/axis2/trunk/c/src/core/description/handler_desc.c
webservices/axis2/trunk/c/src/core/description/svc_grp.c
webservices/axis2/trunk/c/src/core/description/transport_in_desc.c
webservices/axis2/trunk/c/src/core/description/transport_out_desc.c
Modified: webservices/axis2/trunk/c/src/core/description/desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/desc.c?rev=640736&r1=640735&r2=640736&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/desc.c (original)
+++ webservices/axis2/trunk/c/src/core/description/desc.c Tue Mar 25 01:11:32 2008
@@ -41,8 +41,6 @@
{
axis2_desc_t *desc = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
desc = (axis2_desc_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_desc_t));
if (!desc)
@@ -81,8 +79,6 @@
axis2_desc_t * desc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (desc->children)
{
axutil_hash_index_t *hi = NULL;
@@ -126,7 +122,6 @@
const axutil_env_t * env,
axutil_param_t * param)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FALSE);
return axutil_param_container_add_param(desc->param_container, env, param);
@@ -161,7 +156,6 @@
{
axutil_param_t *param_l = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
param_l = axis2_desc_get_param(desc, env, param_name);
@@ -176,8 +170,6 @@
const axis2_char_t * key,
const void *child)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
-
if (desc->children)
{
axutil_hash_set(desc->children, key, AXIS2_HASH_KEY_STRING, child);
@@ -209,8 +201,6 @@
const axutil_env_t * env,
const axis2_char_t * key)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
-
if (desc->children)
{
axutil_hash_set(desc->children, key, AXIS2_HASH_KEY_STRING, NULL);
@@ -265,3 +255,4 @@
}
return desc->policy_include;
}
+
Modified: webservices/axis2/trunk/c/src/core/description/flow.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/flow.c?rev=640736&r1=640735&r2=640736&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/src/core/description/flow.c Tue Mar 25 01:11:32 2008
@@ -29,7 +29,6 @@
{
axis2_flow_t *flow = NULL;
- AXIS2_ENV_CHECK(env, NULL);
flow = (axis2_flow_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_flow_t));
if (!flow)
@@ -56,8 +55,6 @@
axis2_flow_t * flow,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (flow->list)
{
int i = 0;
@@ -91,7 +88,6 @@
{
axis2_flow_t *flow_l = NULL;
- AXIS2_ENV_CHECK(env, void);
flow_l = (axis2_flow_t *) flow;
axis2_flow_free(flow_l, env);
return;
@@ -103,7 +99,6 @@
const axutil_env_t * env,
axis2_handler_desc_t * handler)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, handler, AXIS2_FAILURE);
if (!flow->list)
@@ -135,3 +130,4 @@
{
return axutil_array_list_size(flow->list, env);
}
+
Modified: webservices/axis2/trunk/c/src/core/description/flow_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/flow_container.c?rev=640736&r1=640735&r2=640736&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/flow_container.c (original)
+++ webservices/axis2/trunk/c/src/core/description/flow_container.c Tue Mar 25 01:11:32 2008
@@ -33,8 +33,6 @@
{
axis2_flow_container_t *flow_container = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
flow_container = (axis2_flow_container_t *) AXIS2_MALLOC(env->
allocator,
sizeof
@@ -59,8 +57,6 @@
axis2_flow_container_t * flow_container,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (flow_container->in)
{
axis2_flow_free(flow_container->in, env);
@@ -103,8 +99,6 @@
const axutil_env_t * env,
axis2_flow_t * in_flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (flow_container->in)
{
axis2_flow_free(flow_container->in, env);
@@ -127,8 +121,6 @@
const axutil_env_t * env,
axis2_flow_t * out_flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (flow_container->out)
{
axis2_flow_free(flow_container->out, env);
@@ -151,7 +143,6 @@
const axutil_env_t * env,
axis2_flow_t * falut_in_flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (flow_container->in_fault)
{
axis2_flow_free(flow_container->in_fault, env);
@@ -174,7 +165,6 @@
const axutil_env_t * env,
axis2_flow_t * fault_out_flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_out_flow, AXIS2_FAILURE);
if (flow_container->out_fault)
{
@@ -183,3 +173,4 @@
flow_container->out_fault = fault_out_flow;
return AXIS2_SUCCESS;
}
+
Modified: webservices/axis2/trunk/c/src/core/description/handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/handler_desc.c?rev=640736&r1=640735&r2=640736&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/src/core/description/handler_desc.c Tue Mar 25 01:11:32 2008
@@ -50,12 +50,11 @@
{
axis2_handler_desc_t *handler_desc = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
handler_desc = AXIS2_MALLOC(env->allocator, sizeof(axis2_handler_desc_t));
if (!handler_desc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory");
return NULL;
}
@@ -106,7 +105,6 @@
const axutil_env_t * env,
axutil_string_t * name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (handler_desc->name)
{
axutil_string_free(handler_desc->name, env);
@@ -135,8 +133,9 @@
const axutil_env_t * env,
axis2_phase_rule_t * phase_rule)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
+ const axutil_string_t *str_name = axis2_handler_desc_get_name(handler_desc,
+ env);
+ const axis2_char_t *name = axutil_string_get_buffer(str_name, env);
if (handler_desc->rules)
{
axis2_phase_rule_free(handler_desc->rules, env);
@@ -147,6 +146,8 @@
handler_desc->rules = axis2_phase_rule_clone(phase_rule, env);
if (!(handler_desc->rules))
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Phase rule cloning failed for handler description %s", name);
return AXIS2_FAILURE;
}
}
@@ -170,15 +171,18 @@
const axutil_env_t * env,
axutil_param_t * param)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- if (axutil_param_container_is_param_locked(handler_desc->parent, env,
- axutil_param_get_name(param,
- env)))
+ const axutil_string_t *str_name = axis2_handler_desc_get_name(handler_desc,
+ env);
+ const axis2_char_t *name = axutil_string_get_buffer(str_name, env);
+ axis2_char_t *param_name = axutil_param_get_name(param, env);
+ if (axutil_param_container_is_param_locked(handler_desc->parent, env,
+ param_name))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Parameter %s is locked for handler %s", param_name, name);
return AXIS2_FAILURE;
}
@@ -201,9 +205,7 @@
const axutil_env_t * env,
const axis2_char_t * param_name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- /* see if it is locked in parent */
+ /* See if it is locked in parent */
if (axutil_param_container_is_param_locked(handler_desc->parent, env,
param_name))
{
@@ -228,9 +230,8 @@
const axutil_env_t * env,
axis2_handler_t * handler)
{
- /* handler description is the place where the handler really lives.
- Hence this is a deep copy and should be freed by the free method. */
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ /* Handler description is the place where the handler really lives.
+ Hence this is a deep copy and should be freed by the free function. */
if (handler_desc->handler && (handler_desc->handler != handler))
{
@@ -258,8 +259,6 @@
const axutil_env_t * env,
const axis2_char_t * class_name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (handler_desc->class_name)
{
AXIS2_FREE(env->allocator, handler_desc->class_name);
@@ -271,6 +270,7 @@
if (!handler_desc->class_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory");
return AXIS2_FAILURE;
}
}
@@ -292,8 +292,7 @@
const axutil_env_t * env,
axutil_param_container_t * parent)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- handler_desc->parent = parent; /* shallow copy, because
+ handler_desc->parent = parent; /* Shallow copy, because
the parent lives somewhere else */
return AXIS2_SUCCESS;
}
@@ -303,8 +302,6 @@
axis2_handler_desc_t * handler_desc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (handler_desc->param_container)
{
axutil_param_container_free(handler_desc->param_container, env);
@@ -344,3 +341,4 @@
{
return handler_desc->param_container;
}
+
Modified: webservices/axis2/trunk/c/src/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/svc_grp.c?rev=640736&r1=640735&r2=640736&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/src/core/description/svc_grp.c Tue Mar 25 01:11:32 2008
@@ -55,6 +55,7 @@
if (!svc_grp)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory");
return NULL;
}
@@ -71,6 +72,8 @@
{
axis2_svc_grp_free(svc_grp, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Creating parameter container failed");
return NULL;
}
@@ -79,6 +82,8 @@
{
axis2_svc_grp_free(svc_grp, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Creating module qnames list failed");
return NULL;
}
@@ -87,6 +92,7 @@
{
axis2_svc_grp_free(svc_grp, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Creating modules list failed");
return NULL;
}
@@ -95,6 +101,7 @@
{
axis2_svc_grp_free(svc_grp, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Creating services map failed");
return NULL;
}
@@ -185,6 +192,7 @@
if (!svc_grp->svc_grp_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No Memory");
return AXIS2_FAILURE;
}
@@ -216,7 +224,11 @@
{
svc_grp->svcs = axutil_hash_make(env);
if (!svc_grp->svcs)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Creating services list failed");
return AXIS2_FAILURE;
+ }
}
svc_qname = axis2_svc_get_qname(svc, env);
svc_name = axutil_qname_to_string((axutil_qname_t *) svc_qname, env);
@@ -231,7 +243,8 @@
{
/* remove the previously added service */
axutil_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
-
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Creating phase resolver failed for service %s", svc_name);
return AXIS2_FAILURE;
}
@@ -241,6 +254,9 @@
/* remove the previously added service */
axutil_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
axis2_phase_resolver_free(handler_resolver, env);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Building chains failed within phase resolver for service %s",
+ svc_name);
return status;
}
@@ -250,6 +266,8 @@
/* remove the previously added service */
axutil_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
axis2_phase_resolver_free(handler_resolver, env);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Setting last update failed for service %s", svc_name);
return status;
}
@@ -259,6 +277,8 @@
/* remove the previously added service */
axutil_hash_set(svc_grp->svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
axis2_phase_resolver_free(handler_resolver, env);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Setting parent failed for service %s", svc_name);
return status;
}
@@ -314,15 +334,17 @@
const axutil_env_t * env,
axutil_param_t * param)
{
+ const axis2_char_t *svc_grp_name = axis2_svc_grp_get_name(svc_grp, env);
+ axis2_char_t *param_name = axutil_param_get_name(param, env);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
-
- if (AXIS2_TRUE == axis2_svc_grp_is_param_locked(svc_grp, env,
- axutil_param_get_name(param,
- env)))
+ if (axis2_svc_grp_is_param_locked(svc_grp, env, param_name))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Parameter %s is locked for service group %s", param_name,
+ svc_grp_name);
return AXIS2_FAILURE;
}
return axutil_param_container_add_param(svc_grp->param_container, env,
@@ -340,7 +362,7 @@
param =
axutil_param_container_get_param(svc_grp->param_container, env, name);
- if (param == NULL && svc_grp->parent)
+ if (!param && svc_grp->parent)
{
param = axis2_conf_get_param(svc_grp->parent, env, name);
}
@@ -369,17 +391,17 @@
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
parent = axis2_svc_grp_get_parent(svc_grp, env);
- /* checking the locked value of parent */
+ /* Checking the locked value of parent */
if (parent)
{
locked = axis2_conf_is_param_locked(parent, env, param_name);
}
- if (AXIS2_TRUE == locked)
+ if (locked)
{
ret = AXIS2_TRUE;
}
param = axis2_svc_grp_get_param(svc_grp, env, param_name);
- if (param && AXIS2_TRUE == axutil_param_is_locked(param, env))
+ if (param && axutil_param_is_locked(param, env))
{
ret = AXIS2_TRUE;
}
@@ -440,26 +462,26 @@
axutil_hash_t *svc_map = NULL;
axis2_phase_resolver_t *phase_resolver = NULL;
axis2_module_desc_t *module = NULL;
+ const axis2_char_t *svc_grp_name = axis2_svc_grp_get_name(svc_grp, env);
int size = 0;
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
size = axutil_array_list_size(svc_grp->module_qnames, env);
- if (AXIS2_TRUE != AXIS2_ERROR_GET_STATUS_CODE(env->error))
- {
- return AXIS2_FAILURE;
- }
for (i = 0; size; i++)
{
modu = axutil_array_list_get(svc_grp->module_qnames, env, i);
modu_local = axutil_qname_get_localpart(modu, env);
module_name_local = axutil_qname_get_localpart(module_name, env);
- if (0 == axutil_strcmp(modu_local, module_name_local))
+ if (!axutil_strcmp(modu_local, module_name_local))
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC_GRP,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Module %s is already engaged to service group %s",
+ module_name_local, svc_grp_name);
return AXIS2_FAILURE;
}
}
@@ -467,6 +489,8 @@
svc_map = axis2_svc_grp_get_all_svcs(svc_grp, env);
if (!svc_map)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Service map not found for service group %s", svc_grp_name);
return AXIS2_FAILURE;
}
@@ -475,6 +499,8 @@
if (!phase_resolver)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Creating phase resolver failed for service group %s", svc_grp_name);
return AXIS2_FAILURE;
}
@@ -487,10 +513,12 @@
index = axutil_hash_first(svc_map, env);
while (index)
{
+ const axis2_char_t *svc_name = NULL;
void *v = NULL;
/* engage in per each service */
axutil_hash_this(index, NULL, NULL, &v);
axis_svc = (axis2_svc_t *) v;
+ svc_name = axis2_svc_get_name(axis_svc, env);
status = axis2_phase_resolver_engage_module_to_svc(phase_resolver,
env, axis_svc,
module);
@@ -500,6 +528,9 @@
{
axis2_phase_resolver_free(phase_resolver, env);
}
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Engaging module %s to service %s failed",
+ module_name_local, svc_name);
return status;
}
index = axutil_hash_next(env, index);
@@ -527,13 +558,20 @@
const axutil_env_t * env,
const axutil_qname_t * moduleref)
{
+ const axis2_char_t *svc_grp_name = NULL;
AXIS2_PARAM_CHECK(env->error, moduleref, AXIS2_FAILURE);
+ svc_grp_name = axis2_svc_grp_get_name(svc_grp, env);
if (!svc_grp->module_list)
{
svc_grp->module_list = axutil_array_list_create(env, 0);
if (!svc_grp->module_list)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Creating module list failed for service group %s",
+ svc_grp_name);
return AXIS2_FAILURE;
+ }
}
return axutil_array_list_add(svc_grp->module_list, env, moduleref);
}
@@ -553,13 +591,18 @@
axis2_conf_ctx_t * parent)
{
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
+ const axis2_char_t *svc_grp_name = NULL;
AXIS2_PARAM_CHECK(env->error, parent, NULL);
+ svc_grp_name = axis2_svc_grp_get_name(svc_grp, env);
svc_grp_ctx =
axis2_svc_grp_ctx_create(env, (axis2_svc_grp_t *) svc_grp, parent);
if (!svc_grp_ctx)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Creating service group context failed for service group %s",
+ svc_grp_name);
return NULL;
}
return svc_grp_ctx;
@@ -580,3 +623,4 @@
{
return svc_grp->base;
}
+
Modified: webservices/axis2/trunk/c/src/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/transport_in_desc.c?rev=640736&r1=640735&r2=640736&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/src/core/description/transport_in_desc.c Tue Mar 25 01:11:32 2008
@@ -44,8 +44,6 @@
{
axis2_transport_in_desc_t *transport_in = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
transport_in = (axis2_transport_in_desc_t *) AXIS2_MALLOC(env->allocator,
sizeof
(axis2_transport_in_desc_t));
@@ -80,8 +78,6 @@
axis2_transport_in_desc_t * transport_in,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (transport_in->recv)
{
axis2_transport_receiver_free(transport_in->recv, env);
@@ -124,8 +120,6 @@
{
axis2_transport_in_desc_t *transport_in_l = NULL;
- AXIS2_ENV_CHECK(env, void);
-
transport_in_l = (axis2_transport_in_desc_t *) transport_in;
axis2_transport_in_desc_free(transport_in_l, env);
return;
@@ -136,7 +130,6 @@
const axis2_transport_in_desc_t * transport_in,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return transport_in->trans_enum;
}
@@ -146,8 +139,6 @@
const axutil_env_t * env,
const AXIS2_TRANSPORT_ENUMS trans_enum)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
transport_in->trans_enum = trans_enum;
return AXIS2_SUCCESS;
}
@@ -157,7 +148,6 @@
const axis2_transport_in_desc_t * transport_in,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return transport_in->in_flow;
}
@@ -167,7 +157,6 @@
const axutil_env_t * env,
axis2_flow_t * in_flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, in_flow, AXIS2_FAILURE);
if (transport_in->in_flow)
@@ -192,7 +181,6 @@
const axutil_env_t * env,
axis2_flow_t * fault_in_flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_in_flow, AXIS2_FAILURE);
if (transport_in->fault_in_flow)
@@ -208,7 +196,6 @@
const axis2_transport_in_desc_t * transport_in,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return transport_in->recv;
}
@@ -218,7 +205,6 @@
const axutil_env_t * env,
axis2_transport_receiver_t * recv)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, recv, AXIS2_FAILURE);
if (transport_in->recv)
@@ -235,8 +221,6 @@
const axis2_transport_in_desc_t * transport_in,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return transport_in->in_phase;
}
@@ -246,7 +230,6 @@
const axutil_env_t * env,
axis2_phase_t * in_phase)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, in_phase, AXIS2_FAILURE);
if (transport_in->in_phase)
@@ -262,8 +245,6 @@
const axis2_transport_in_desc_t * transport_in,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return transport_in->fault_phase;
}
@@ -273,7 +254,6 @@
const axutil_env_t * env,
axis2_phase_t * fault_phase)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_phase, AXIS2_FAILURE);
if (transport_in->fault_phase)
@@ -291,7 +271,6 @@
const axutil_env_t * env,
axutil_param_t * param)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
return axutil_param_container_add_param(transport_in_desc->
@@ -304,8 +283,6 @@
const axutil_env_t * env,
const axis2_char_t * param_name)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axutil_param_container_get_param(transport_in_desc->param_container,
env, param_name);
}
@@ -316,7 +293,6 @@
const axutil_env_t * env,
const axis2_char_t * param_name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
return axutil_param_container_is_param_locked(transport_in_desc->
@@ -331,3 +307,4 @@
{
return transport_in_desc->param_container;
}
+
Modified: webservices/axis2/trunk/c/src/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/transport_out_desc.c?rev=640736&r1=640735&r2=640736&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/src/core/description/transport_out_desc.c Tue Mar 25 01:11:32 2008
@@ -38,8 +38,6 @@
{
axis2_transport_out_desc_t *transport_out = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
transport_out = (axis2_transport_out_desc_t *) AXIS2_MALLOC(env->
allocator,
sizeof
@@ -75,8 +73,6 @@
axis2_transport_out_desc_t * transport_out,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (transport_out->sender)
{
AXIS2_TRANSPORT_SENDER_FREE(transport_out->sender, env);
@@ -119,8 +115,6 @@
{
axis2_transport_out_desc_t *transport_out_l = NULL;
- AXIS2_ENV_CHECK(env, void);
-
transport_out_l = (axis2_transport_out_desc_t *) transport_out;
axis2_transport_out_desc_free(transport_out_l, env);
return;
@@ -131,7 +125,6 @@
const axis2_transport_out_desc_t * transport_out,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return transport_out->trans_enum;
}
@@ -141,7 +134,6 @@
const axutil_env_t * env,
const AXIS2_TRANSPORT_ENUMS trans_enum)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
transport_out->trans_enum = trans_enum;
return AXIS2_SUCCESS;
}
@@ -151,7 +143,6 @@
const axis2_transport_out_desc_t * transport_out,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return transport_out->out_flow;
}
@@ -161,7 +152,6 @@
const axutil_env_t * env,
axis2_flow_t * out_flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_flow, AXIS2_FAILURE);
if (transport_out->out_flow)
@@ -186,7 +176,6 @@
const axutil_env_t * env,
axis2_flow_t * fault_out_flow)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_out_flow, AXIS2_FAILURE);
if (transport_out->fault_out_flow)
@@ -202,7 +191,6 @@
const axis2_transport_out_desc_t * transport_out,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return transport_out->sender;
}
@@ -212,7 +200,6 @@
const axutil_env_t * env,
axis2_transport_sender_t * sender)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, sender, AXIS2_FAILURE);
if (transport_out->sender)
@@ -229,8 +216,6 @@
const axis2_transport_out_desc_t * transport_out,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return transport_out->out_phase;
}
@@ -240,7 +225,6 @@
const axutil_env_t * env,
axis2_phase_t * out_phase)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_phase, AXIS2_FAILURE);
if (transport_out->out_phase)
@@ -256,8 +240,6 @@
const axis2_transport_out_desc_t * transport_out,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return transport_out->fault_phase;
}
@@ -267,7 +249,6 @@
const axutil_env_t * env,
axis2_phase_t * fault_phase)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_phase, AXIS2_FAILURE);
if (transport_out->fault_phase)
@@ -285,7 +266,6 @@
const axutil_env_t * env,
axutil_param_t * param)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
return axutil_param_container_add_param(transport_out_desc->
@@ -298,8 +278,6 @@
const axutil_env_t * env,
const axis2_char_t * param_name)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axutil_param_container_get_param(transport_out_desc->param_container,
env, param_name);
}
@@ -310,7 +288,6 @@
const axutil_env_t * env,
const axis2_char_t * param_name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
return axutil_param_container_is_param_locked(transport_out_desc->
@@ -325,3 +302,4 @@
{
return transport_out_desc->param_container;
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org