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 2006/02/10 11:12:17 UTC
svn commit: r376616 - in /webservices/axis2/trunk/c/modules/core:
deployment/dep_engine.c description/svc_grp.c engine/conf.c
phaseresolver/phase_resolver.c
Author: damitha
Date: Fri Feb 10 02:12:15 2006
New Revision: 376616
URL: http://svn.apache.org/viewcvs?rev=376616&view=rev
Log:
more fixes towards getting out handler work
Modified:
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.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_resolver.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=376616&r1=376615&r2=376616&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Fri Feb 10 02:12:15 2006
@@ -307,7 +307,7 @@
engine_impl->conf_name = NULL;
engine_impl->dep_engine.ops = NULL;
- engine_impl->ws_to_deploy = axis2_array_list_create(env, 10);
+ engine_impl->ws_to_deploy = axis2_array_list_create(env, 0);
if (!(engine_impl->ws_to_deploy))
{
axis2_dep_engine_free(&(engine_impl->dep_engine), env);
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?rev=376616&r1=376615&r2=376616&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Fri Feb 10 02:12:15 2006
@@ -619,11 +619,10 @@
axis2_qname_t *modu = NULL;
axis2_char_t *modu_local = NULL;
axis2_char_t *module_name_local = NULL;
- axis2_hash_t *svc = NULL;
+ axis2_hash_t *svc_map = NULL;
axis2_phase_resolver_t *phase_resolver = NULL;
axis2_module_desc_t *module = NULL;
- axis2_svc_t *axis_svc = NULL;
int size = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -648,20 +647,28 @@
}
}
- svc = axis2_svc_grp_get_svcs(svc_grp, env);
- if(NULL == svc) return AXIS2_FAILURE;
+ svc_map = axis2_svc_grp_get_svcs(svc_grp, env);
+ if(NULL == svc_map)
+ {
+ return AXIS2_FAILURE;
+ }
phase_resolver = axis2_phase_resolver_create_with_config(env, svc_grp_impl->
parent);
- if(NULL == phase_resolver) return AXIS2_FAILURE;
+ if(NULL == phase_resolver)
+ {
+ return AXIS2_FAILURE;
+ }
module = AXIS2_CONF_GET_MODULE(svc_grp_impl->parent, env, module_name);
if(NULL != module)
{
+ axis2_svc_t *axis_svc = NULL;
axis2_hash_index_t *index = NULL;
- index = axis2_hash_first (svc, env);
- while(NULL != index);
+
+ index = axis2_hash_first (svc_map, env);
+ while(NULL != index)
{
void *v = NULL;
/* engage in per each service */
@@ -672,14 +679,18 @@
if(AXIS2_FAILURE == status)
{
if(phase_resolver)
+ {
AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env);
+ }
return status;
}
index = axis2_hash_next (env, index);
}
}
if(phase_resolver)
+ {
AXIS2_PHASE_RESOLVER_FREE(phase_resolver, env);
+ }
return axis2_svc_grp_add_module(svc_grp, env, module_name);
}
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/conf.c?rev=376616&r1=376615&r2=376616&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Fri Feb 10 02:12:15 2006
@@ -806,8 +806,6 @@
axis2_hash_t *svcs = NULL;
axis2_hash_index_t *index_i = NULL;
axis2_char_t *svc_name = NULL;
- axis2_char_t *svc_name2 = NULL;
- axis2_qname_t *module_desc = NULL;
axis2_char_t *svc_grp_name = NULL;
int i = 0;
int k = 0;
@@ -831,24 +829,26 @@
{
void *value = NULL;
axis2_svc_t *desc = NULL;
+ axis2_char_t *svc_name2 = NULL;
+ axis2_qname_t *svc_qname = NULL;
axis2_hash_this (index_i, NULL, NULL, &value);
desc = (axis2_svc_t *) value;
- svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(desc, env), env);
+ svc_qname = AXIS2_SVC_GET_QNAME(desc, env);
+ svc_name = AXIS2_QNAME_GET_LOCALPART(svc_qname, env);
svc_name2 = axis2_hash_get(config_impl->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
/* no two service names deployed in the engine can be same */
if(NULL != svc_name2)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_TWO_SVCS_CANNOT_HAVE_SAME_NAME,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_TWO_SVCS_CANNOT_HAVE_SAME_NAME, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
index_i = axis2_hash_next(env, index_i);
}
- svcs = NULL;
svcs = AXIS2_SVC_GRP_GET_SVCS(svc_grp, env);
index_i = axis2_hash_first (svcs, env);
while(NULL != index_i)
@@ -867,13 +867,14 @@
size = AXIS2_ARRAY_LIST_SIZE(config_impl->engaged_modules, env);
while(i < size)
{
+ axis2_qname_t *module_desc = NULL;
module_desc = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(config_impl->
engaged_modules, env, i);
- status = AXIS2_SVC_GRP_ADD_MODULE(svc_grp, env, module_desc);
- if(AXIS2_FAILURE == status)
+ status = AXIS2_SVC_GRP_ENGAGE_MODULE_TO_GRP(svc_grp, env, module_desc);
+ if(AXIS2_SUCCESS != status)
{
- return AXIS2_FAILURE;
+ return status;
}
i++;
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=376616&r1=376615&r2=376616&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Fri Feb 10 02:12:15 2006
@@ -1403,32 +1403,34 @@
{
axis2_phase_resolver_impl_t *resolver_impl = NULL;
axis2_hash_t *ops = NULL;
- axis2_bool_t engaged = AXIS2_FALSE;
axis2_hash_index_t *index_i = NULL;
- void *v = NULL;
- int j = 0;
axis2_status_t status = AXIS2_FAILURE;
-
+ axis2_qname_t *module_d_qname = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
resolver_impl = AXIS2_INTF_TO_IMPL(phase_resolver);
- ops = AXIS2_SVC_GET_OPS(resolver_impl->svc, env);
+ ops = AXIS2_SVC_GET_OPS(svc, env);
if(!ops)
{
return AXIS2_FAILURE;
}
- status = AXIS2_SVC_ADD_MODULE_OPS(resolver_impl->svc, env, module_desc,
+ status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc,
resolver_impl->axis2_config);
if(AXIS2_SUCCESS != status)
{
return status;
}
+ module_d_qname = AXIS2_MODULE_DESC_GET_NAME(module_desc, env);
for (index_i = axis2_hash_first (ops, env); index_i; index_i =
axis2_hash_next (env, index_i))
{
axis2_array_list_t *modules = NULL;
axis2_op_t *op_desc = NULL;
int size = 0;
+ int j = 0;
+ void *v = NULL;
axis2_hash_this (index_i, NULL, NULL, &v);
op_desc = (axis2_op_t *) v;
@@ -1437,13 +1439,11 @@
for(j = 0; j < size; j++)
{
axis2_module_desc_t *module_desc_l = NULL;
- axis2_qname_t *module_d_qname = NULL;
axis2_qname_t *module_d_qname_l = NULL;
-
- module_d_qname = AXIS2_MODULE_DESC_GET_NAME(module_desc, env);
- module_d_qname_l = AXIS2_MODULE_DESC_GET_NAME(module_desc_l, env);
+ axis2_bool_t engaged = AXIS2_FALSE;
module_desc_l = AXIS2_ARRAY_LIST_GET(modules, env, j);
+ module_d_qname_l = AXIS2_MODULE_DESC_GET_NAME(module_desc_l, env);
if(0 == AXIS2_QNAME_EQUALS(module_d_qname, env, module_d_qname_l))
{
engaged = AXIS2_TRUE;