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 sa...@apache.org on 2006/05/17 12:39:34 UTC
svn commit: r407215 - in /webservices/axis2/trunk/c:
modules/core/deployment/phases_info.c
modules/core/phaseresolver/phase_resolver.c
samples/user_guide/clients/echo_blocking_dual.c
Author: samisa
Date: Wed May 17 03:39:32 2006
New Revision: 407215
URL: http://svn.apache.org/viewcvs?rev=407215&view=rev
Log:
Fixed the problem fo dual client failing when addressing is engaged at client level and is not in axis2.xml file
Modified:
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?rev=407215&r1=407214&r2=407215&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Wed May 17 03:39:32 2006
@@ -365,7 +365,7 @@
{
phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(phases_info_impl->in_phases, env, i);
if (0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name) ||
- 0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||
+ /*0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||*/
0 == AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name) ||
0 == AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name))
{
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=407215&r1=407214&r2=407215&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Wed May 17 03:39:32 2006
@@ -1274,18 +1274,18 @@
{
return AXIS2_FAILURE;
}
- if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
+ /*if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
- {
+ {*/
status = AXIS2_PHASE_HOLDER_ADD_HANDLER(resolver_impl->
phase_holder, env, metadata);
- if(AXIS2_SUCCESS != status)
+ /* if(AXIS2_SUCCESS != status)
{
return status;
}
- }
+ }*/
}
}
}
@@ -1552,6 +1552,7 @@
{
axis2_phase_resolver_impl_t *resolver_impl = NULL;
int type = 0;
+ axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, axis_op, AXIS2_FAILURE);
@@ -1639,15 +1640,19 @@
metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
- if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
+ /*if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORTIN, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
- {
- AXIS2_PHASE_HOLDER_ADD_HANDLER(resolver_impl->phase_holder,
+ {*/
+ status = AXIS2_PHASE_HOLDER_ADD_HANDLER(resolver_impl->phase_holder,
env, metadata);
+ if (status != AXIS2_SUCCESS)
+ {
+ axis2_phase_resolver_engage_to_global_chain(phase_resolver, env, module_desc);
+ }
- }
+ /*}
else
{
AXIS2_ERROR_SET((*env)->error,
@@ -1655,7 +1660,7 @@
AXIS2_FAILURE);
continue;
- }
+ }*/
}
}
}
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c?rev=407215&r1=407214&r2=407215&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_blocking_dual.c Wed May 17 03:39:32 2006
@@ -84,7 +84,7 @@
/* Set service client options */
AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
- AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, &env, AXIS2_MODULE_ADDRESSING);
+ AXIS2_SVC_CLIENT_ENGAGE_MODULE(svc_client, &env, AXIS2_MODULE_ADDRESSING);
/* Build the SOAP request message payload using OM API.*/
payload = build_om_payload_for_echo_svc(&env);