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 da...@apache.org on 2007/12/13 17:51:42 UTC
svn commit: r603951 - in /webservices/axis2/trunk/c/src/core/description:
svc.c svc_grp.c
Author: damitha
Date: Thu Dec 13 08:51:40 2007
New Revision: 603951
URL: http://svn.apache.org/viewvc?rev=603951&view=rev
Log:
add log/trace and removing ENV_FREE
Modified:
webservices/axis2/trunk/c/src/core/description/svc.c
webservices/axis2/trunk/c/src/core/description/svc_grp.c
Modified: webservices/axis2/trunk/c/src/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/description/svc.c?rev=603951&r1=603950&r2=603951&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/src/core/description/svc.c Thu Dec 13 08:51:40 2007
@@ -117,8 +117,6 @@
{
axis2_svc_t *svc = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
svc = (axis2_svc_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_svc_t));
if (!svc)
{
@@ -434,7 +432,6 @@
const axutil_qname_t *qname = NULL;
axis2_char_t *key = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
status = axis2_op_set_parent(op, env, svc);
@@ -465,7 +462,6 @@
axis2_op_t *op = NULL;
axis2_char_t *key = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, op_qname, NULL);
key = axutil_qname_get_localpart(op_qname, env);
@@ -484,7 +480,6 @@
const axutil_env_t * env,
const axis2_char_t * nc_name)
{
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, nc_name, NULL);
return (axis2_op_t *) axutil_hash_get(svc->op_alias_map, nc_name,
@@ -496,8 +491,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return svc->op_alias_map;
}
@@ -507,7 +500,6 @@
const axutil_env_t * env,
axis2_svc_grp_t * svc_grp)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
svc->parent = svc_grp;
@@ -525,8 +517,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return svc->parent;
}
@@ -536,7 +526,6 @@
const axutil_env_t * env,
const axutil_qname_t * qname)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
if (svc->qname)
{
@@ -555,7 +544,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc->qname;
}
@@ -565,7 +553,6 @@
const axutil_env_t * env,
axutil_param_t * param)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
if (AXIS2_TRUE == axis2_svc_is_param_locked(svc, env,
@@ -592,7 +579,6 @@
const axis2_char_t * name)
{
axutil_param_t *param = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, name, NULL);
param = axutil_param_container_get_param(svc->param_container, env, name);
@@ -608,8 +594,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axutil_param_container_get_params(svc->param_container, env);
}
@@ -624,7 +608,6 @@
axis2_svc_grp_t *parent = NULL;
axis2_bool_t ret = AXIS2_FALSE;
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
/* checking the locked value of parent */
@@ -654,7 +637,7 @@
axis2_phase_resolver_t *phase_resolver = NULL;
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Entry:axis2_svc_engage_module");
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
@@ -677,6 +660,7 @@
axis2_phase_resolver_free(phase_resolver, env);
}
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Exit:axis2_svc_engage_module");
return status;
}
@@ -688,6 +672,7 @@
{
int i = 0,
size = 0;
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Entry:axis2_svc_is_module_engaged");
size = axutil_array_list_size(svc->engaged_modules, env);
for (i = 0; i < size; i++)
{
@@ -704,6 +689,7 @@
return AXIS2_TRUE;
}
}
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Exit:axis2_svc_is_module_engaged");
return AXIS2_FALSE;
}
@@ -717,7 +703,6 @@
axis2_phase_resolver_t *phase_resolver = NULL;
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
@@ -748,8 +733,7 @@
axis2_op_t *op_desc = NULL;
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Start:axis2_svc_add_module_ops");
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Entry:axis2_svc_add_module_ops");
AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
@@ -826,7 +810,7 @@
{
axis2_phase_resolver_free(phase_resolver, env);
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "End:axis2_svc_add_module_ops");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Exit:axis2_svc_add_module_ops");
return AXIS2_SUCCESS;
}
@@ -835,8 +819,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
if (svc->qname)
{
return axutil_qname_get_localpart(svc->qname, env);
@@ -851,7 +833,6 @@
const axutil_env_t * env,
const axis2_char_t * axis_svc_name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, axis_svc_name, AXIS2_FAILURE);
if (svc->axis_svc_name)
@@ -898,7 +879,6 @@
const axutil_env_t * env,
const axis2_char_t * filename)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, filename, AXIS2_FAILURE);
if (svc->filename)
@@ -929,7 +909,6 @@
const axutil_env_t * env,
const axis2_char_t * svc_desc)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_desc, AXIS2_FAILURE);
if (svc->svc_desc)
@@ -953,7 +932,6 @@
const axis2_char_t * mapping_key,
axis2_op_t * op_desc)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mapping_key, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
@@ -970,7 +948,6 @@
{
axutil_qname_t *qmodule_qname_l = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_qname, AXIS2_FAILURE);
qmodule_qname_l = axutil_qname_clone((axutil_qname_t *) module_qname, env);
@@ -982,8 +959,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return svc->module_list;
}
@@ -992,7 +967,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc->target_ns;
}
@@ -1002,7 +976,6 @@
const axutil_env_t * env,
const axis2_char_t * ns)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ns, AXIS2_FAILURE);
if (svc->target_ns)
@@ -1019,7 +992,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc->target_ns_prefix;
}
@@ -1029,7 +1001,6 @@
const axutil_env_t * env,
const axis2_char_t * prefix)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, prefix, AXIS2_FAILURE);
if (svc->target_ns_prefix)
@@ -1046,7 +1017,6 @@
const axis2_svc_t * svc,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return svc->ns_map;
}
@@ -1058,7 +1028,6 @@
{
axutil_hash_index_t *hi = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ns_map, AXIS2_FAILURE);
if (svc->ns_map)
@@ -1095,7 +1064,6 @@
axutil_hash_t *new_table = NULL;
axutil_hash_index_t *hi = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, orig_table, AXIS2_FAILURE);
new_table = axutil_hash_make(env);
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=603951&r1=603950&r2=603951&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/src/core/description/svc_grp.c Thu Dec 13 08:51:40 2007
@@ -49,7 +49,6 @@
const axutil_env_t * env)
{
axis2_svc_grp_t *svc_grp = NULL;
- AXIS2_ENV_CHECK(env, NULL);
svc_grp = (axis2_svc_grp_t *)
AXIS2_MALLOC(env->allocator, sizeof(axis2_svc_grp_t));
@@ -116,7 +115,6 @@
{
axis2_svc_grp_t *svc_grp = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, conf, NULL);
svc_grp = (axis2_svc_grp_t *) axis2_svc_grp_create(env);
@@ -137,8 +135,6 @@
axis2_svc_grp_t * svc_grp,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (svc_grp->param_container)
{
axutil_param_container_free(svc_grp->param_container, env);
@@ -183,8 +179,6 @@
const axutil_env_t * env,
const axis2_char_t * name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (svc_grp->svc_grp_name)
AXIS2_FREE(env->allocator, svc_grp->svc_grp_name);
svc_grp->svc_grp_name = axutil_strdup(env, name);
@@ -216,7 +210,6 @@
const axutil_qname_t *svc_qname = NULL;
axis2_char_t *svc_name = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
if (!svc_grp->svcs)
@@ -281,7 +274,6 @@
{
axis2_char_t *name = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, qname, NULL);
name = axutil_qname_to_string((axutil_qname_t *) qname, env);
@@ -306,7 +298,6 @@
axis2_svc_t *svc = NULL;
axis2_char_t *svc_name = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_name, AXIS2_FAILURE);
svc = axis2_svc_grp_get_svc(svc_grp, env, svc_qname);
@@ -323,7 +314,6 @@
const axutil_env_t * env,
axutil_param_t * param)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
if (AXIS2_TRUE == axis2_svc_grp_is_param_locked(svc_grp, env,
@@ -351,7 +341,6 @@
const axis2_char_t * name)
{
axutil_param_t *param = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
param =
@@ -368,8 +357,6 @@
const axis2_svc_grp_t * svc_grp,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axutil_param_container_get_params(svc_grp->param_container, env);
}
@@ -384,7 +371,6 @@
axutil_param_t *param = NULL;
axis2_bool_t ret = AXIS2_FALSE;
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
parent = axis2_svc_grp_get_parent(svc_grp, env);
@@ -415,8 +401,6 @@
const axutil_env_t * env,
const axutil_qname_t * module_qname)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
return axutil_array_list_add(svc_grp->module_qnames, env, module_qname);
}
@@ -434,7 +418,6 @@
const axutil_env_t * env,
axis2_conf_t * parent)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, parent, AXIS2_FAILURE);
if (svc_grp->parent)
@@ -465,7 +448,6 @@
int size = 0;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
size = axutil_array_list_size(svc_grp->module_qnames, env);
@@ -550,7 +532,6 @@
const axutil_env_t * env,
const axutil_qname_t * moduleref)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, moduleref, AXIS2_FAILURE);
if (!svc_grp->module_list)
@@ -578,7 +559,6 @@
{
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, parent, NULL);
svc_grp_ctx =
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org