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/01/31 15:27:24 UTC
svn commit: r373820 - in /webservices/axis2/trunk/c/modules/core/engine:
addr_disp.c conf.c disp_checker.c engine.c phase.c
Author: samisa
Date: Tue Jan 31 06:27:12 2006
New Revision: 373820
URL: http://svn.apache.org/viewcvs?rev=373820&view=rev
Log:
Added more stub related fixes
Modified:
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/phase.c
Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?rev=373820&r1=373819&r2=373820&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Tue Jan 31 06:27:12 2006
@@ -158,7 +158,6 @@
if (action)
{
- axis2_char_t message[1024];
AXIS2_LOG_DEBUG((*env)->log, LOG_SI, "Checking for operation using WSAAction : %s", action);
qname = axis2_qname_create(env, action, NULL, NULL);
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=373820&r1=373819&r2=373820&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Tue Jan 31 06:27:12 2006
@@ -1155,7 +1155,7 @@
qname = AXIS2_TRANSPORT_OUT_DESC_GET_QNAME(transport, env);
if (!qname)
- AXIS2_FAILURE;
+ return AXIS2_FAILURE;
axis2_hash_set(config_impl->transports_out,
AXIS2_QNAME_TO_STRING(qname, env),
AXIS2_HASH_KEY_STRING, transport);
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?rev=373820&r1=373819&r2=373820&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Tue Jan 31 06:27:12 2006
@@ -202,11 +202,15 @@
axis2_svc_t *svc = NULL;
axis2_svc_ctx_t *svc_ctx = NULL;
axis2_endpoint_ref_t *endpoint_ref = NULL;
+ axis2_char_t *address = NULL;
AXIS2_FUNC_PARAM_CHECK(handler, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
+ if (!(AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))) /*if is client side, no point in proceeding*/
+ return AXIS2_FAILURE;
+
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (!op)
@@ -234,18 +238,20 @@
}
endpoint_ref = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
+ if (endpoint_ref)
+ address = AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env);
svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
if (!svc)
{
- AXIS2_LOG_INFO((*env)->log, LOG_SI, "Service Not found. Endpoint reference is : %s", (endpoint_ref)?endpoint_ref:"NULL");
+ AXIS2_LOG_INFO((*env)->log, "Service Not found. Endpoint reference is : %s", (address)?address:"NULL");
return AXIS2_FAILURE;
}
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
if (!op)
{
- AXIS2_LOG_INFO((*env)->log, LOG_SI, "Operation Not found. Endpoint reference is : %s", (endpoint_ref)?endpoint_ref:"NULL");
+ AXIS2_LOG_INFO((*env)->log, "Operation Not found. Endpoint reference is : %s", (address)?address:"NULL");
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=373820&r1=373819&r2=373820&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Jan 31 06:27:12 2006
@@ -100,7 +100,7 @@
engine_impl->engine.ops->get_receiver_fault_code = axis2_engine_get_receiver_fault_code;
engine_impl->engine.ops->free = axis2_engine_free;
- AXIS2_LOG_INFO((*env)->log, LOG_SI, "Axis2 Engine Started");
+ AXIS2_LOG_INFO((*env)->log, "Axis2 Engine Started");
return &(engine_impl->engine);
}
@@ -488,7 +488,7 @@
AXIS2_MSG_CTX_SET_PROCESS_FAULT(fault_ctx, env, AXIS2_TRUE);
AXIS2_MSG_CTX_SET_SERVER_SIDE(fault_ctx, env, AXIS2_TRUE);
AXIS2_MSG_CTX_SET_PROPERTY(fault_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
- AXIS2_MSG_CTX_GET_PROPERTY(processing_context, env, AXIS2_HTTP_OUT_TRANSPORT_INFO, AXIS2_TRUE), AXIS2_TRUE );
+ AXIS2_MSG_CTX_GET_PROPERTY(processing_context, env, AXIS2_HTTP_OUT_TRANSPORT_INFO, AXIS2_TRUE), AXIS2_TRUE );
/*axis2_soap_envelope_t *envelope = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/phase.c?rev=373820&r1=373819&r2=373820&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Tue Jan 31 06:27:12 2006
@@ -180,7 +180,7 @@
phase_impl = AXIS2_INTF_TO_IMPL(phase);
- AXIS2_LOG_INFO((*env)->log, LOG_SI, "Handler %s added to phase %s",
+ AXIS2_LOG_INFO((*env)->log, "Handler %s added to phase %s",
AXIS2_QNAME_GET_LOCALPART(AXIS2_HANDLER_GET_NAME(handler, env), env),
phase_impl->name);
@@ -210,7 +210,7 @@
}
else
{
- AXIS2_LOG_INFO((*env)->log, LOG_SI, "Invoke the first handler %s within the phase %s",
+ AXIS2_LOG_INFO((*env)->log, "Invoke the first handler %s within the phase %s",
AXIS2_QNAME_GET_LOCALPART(AXIS2_HANDLER_GET_NAME(phase_impl->first_handler, env), env),
phase_impl->name);
status = AXIS2_HANDLER_INVOKE(phase_impl->first_handler, env, msg_ctx);
@@ -254,7 +254,7 @@
}
else
{
- AXIS2_LOG_INFO((*env)->log, LOG_SI, "Invoke the last handler %s within the phase %s",
+ AXIS2_LOG_INFO((*env)->log, "Invoke the last handler %s within the phase %s",
AXIS2_QNAME_GET_LOCALPART(AXIS2_HANDLER_GET_NAME(phase_impl->last_handler, env), env),
phase_impl->name);
status = AXIS2_HANDLER_INVOKE(phase_impl->last_handler, env, msg_ctx);