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 2006/07/31 13:17:03 UTC
svn commit: r427073 - in /webservices/axis2/trunk/c/modules/core:
description/op.c phaseresolver/phase_resolver.c
Author: damitha
Date: Mon Jul 31 04:17:03 2006
New Revision: 427073
URL: http://svn.apache.org/viewvc?rev=427073&view=rev
Log:
Sahan pointed that server does not start when sandesha2 modules is added
to axis2.xml. Fixed this.
Modified:
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?rev=427073&r1=427072&r2=427073&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Jul 31 04:17:03 2006
@@ -1009,22 +1009,27 @@
size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
- return AXIS2_FAILURE;
+ return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
for(index = 0; index < size; index++)
{
+ axis2_qname_t *qname1 = NULL;
+ axis2_qname_t *qname2 = NULL;
+
module_desc = (axis2_module_desc_t *) AXIS2_ARRAY_LIST_GET(
collection_module, env, index);
if(!module_desc)
{
return AXIS2_FAILURE;
}
- if(AXIS2_QNAME_EQUALS(AXIS2_MODULE_DESC_GET_NAME(module_desc, env), env,
- AXIS2_MODULE_DESC_GET_NAME(moduleref, env)))
+ qname1 = AXIS2_MODULE_DESC_GET_NAME(module_desc, env);
+ qname2 = AXIS2_MODULE_DESC_GET_NAME(moduleref, env);
+ if(AXIS2_QNAME_EQUALS(qname1, env, qname2))
{
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_OP, AXIS2_FAILURE);
+ /*AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_OP, AXIS2_FAILURE);*/
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Module already engaged to operation");
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=427073&r1=427072&r2=427073&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Mon Jul 31 04:17:03 2006
@@ -401,7 +401,7 @@
return status;
}
status = AXIS2_OP_ADD_TO_ENGAGE_MODULE_LIST(op, env, module_desc);
- if(AXIS2_FAILURE == status)
+ if(AXIS2_SUCCESS != status)
{
return status;
}
@@ -419,9 +419,9 @@
int j = 0;
int count = 0;
count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
- if(AXIS2_TRUE != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
- return AXIS2_FAILURE;
+ return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
@@ -530,14 +530,14 @@
int count = 0;
count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
- if(AXIS2_FAILURE == AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
if(all_handlers)
{
AXIS2_ARRAY_LIST_FREE(all_handlers, env);
all_handlers = NULL;
}
- return AXIS2_FAILURE;
+ return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
for (j = 0; j < count; j++)
{
@@ -670,7 +670,7 @@
size = AXIS2_ARRAY_LIST_SIZE(all_handlers, env);
if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
- return AXIS2_FAILURE;
+ return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
for (i = 0; i < size; i++)
@@ -932,9 +932,9 @@
int hndlr_count = 0;
int j = 0;
hndlr_count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
- if(AXIS2_TRUE != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
- return AXIS2_FAILURE;
+ return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
handlers = axis2_array_list_create(env, 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org