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 sa...@apache.org on 2006/04/20 19:30:34 UTC
svn commit: r395650 - in /webservices/axis2/trunk/c/modules/core:
clientapi/call.c engine/conf.c phaseresolver/phase_resolver.c
Author: samisa
Date: Thu Apr 20 10:30:33 2006
New Revision: 395650
URL: http://svn.apache.org/viewcvs?rev=395650&view=rev
Log:
fixes related to module engaging on client side, there were a problem in engaging the same handler
from a module multiple times incorrectly to the same phase
Modified:
webservices/axis2/trunk/c/modules/core/clientapi/call.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/clientapi/call.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/call.c?rev=395650&r1=395649&r2=395650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/call.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/call.c Thu Apr 20 10:30:33 2006
@@ -1362,10 +1362,10 @@
AXIS2_QNAME_FREE(qtemp_op, env);
info = AXIS2_CONF_GET_PHASESINFO(conf, env);
/* to set the operation flows */
- if(info != NULL)
+ /*if(info != NULL)
{
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, call_impl->op_template);
- }
+ }*/
AXIS2_SVC_ADD_OP(axis_svc, env, call_impl->op_template);
AXIS2_CONF_ADD_SVC(conf, env, axis_svc);
}
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=395650&r1=395649&r2=395650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Thu Apr 20 10:30:33 2006
@@ -937,7 +937,8 @@
/* notifyObservers(AxisEvent.SERVICE_DEPLOY ,description); */
index_i = axis2_hash_next(env, index_i);
}
- size = AXIS2_ARRAY_LIST_SIZE(config_impl->engaged_modules, env);
+
+ /*size = AXIS2_ARRAY_LIST_SIZE(config_impl->engaged_modules, env);
while(i < size)
{
axis2_qname_t *module_desc = NULL;
@@ -950,7 +951,7 @@
return status;
}
i++;
- }
+ }*/
svc_grp_name = AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
if(!config_impl->svc_grps)
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=395650&r1=395649&r2=395650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Thu Apr 20 10:30:33 2006
@@ -476,11 +476,12 @@
}
}
+
/**************************************************************************/
/************************** SERVICE HANDLERS ******************************/
/**************************************************************************/
-
+ flow = NULL;
switch (type)
{
@@ -607,7 +608,8 @@
}
}
}
- else
+
+ else if (!all_handlers)
{
/* no flows configured */
return AXIS2_SUCCESS;