You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2007/05/02 13:52:41 UTC
svn commit: r534400 - in /webservices/sandesha/trunk/c/src:
msgprocessors/app_msg_processor.c msgprocessors/create_seq_msg_processor.c
msgprocessors/terminate_seq_msg_processor.c util/ack_mgr.c
util/sandesha2_utils.c
Author: damitha
Date: Wed May 2 04:52:40 2007
New Revision: 534400
URL: http://svn.apache.org/viewvc?view=rev&rev=534400
Log:
Adding log messages where appropriate and cleaning the code.
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=534400&r1=534399&r2=534400
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed May 2 04:52:40 2007
@@ -670,15 +670,14 @@
AXIS2_WSDL_MESSAGE_LABEL_IN);
/* TODO setting up fault callback */
- /*axutil_allocator_switch_to_global_pool(env->allocator);*/
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
axis2_conf_ctx_get_conf(conf_ctx, env));
- /*axutil_allocator_switch_to_local_pool(env->allocator);*/
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
if(!seq_prop_mgr)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "seq_prop_mgr is NULL");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]seq_prop_mgr is NULL");
return AXIS2_FAILURE;
}
is_svr_side = axis2_msg_ctx_get_server_side(msg_ctx, env);
@@ -688,7 +687,8 @@
|| 0 == axutil_strlen(axis2_endpoint_ref_get_address(
to_epr, env))) && !is_svr_side)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "to epr is not set - a"
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]To epr is not set - a"
"requirement in sandesha client side");
return AXIS2_FAILURE;
}
@@ -712,7 +712,8 @@
req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
if(!req_seq)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence is NULL");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Sequence is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -721,7 +722,8 @@
sandesha2_seq_get_identifier(req_seq, env), env);
if(!incoming_seq_id)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence ID is NULL");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Sequence ID is NULL");
return AXIS2_FAILURE;
}
request_msg_no = SANDESHA2_MSG_NUMBER_GET_MSG_NUM(
@@ -766,13 +768,9 @@
if(!spec_ver)
{
axutil_property_t *spec_ver_prop = NULL;
- /*sandesha2_seq_property_bean_t *spec_ver_bean = NULL;*/
spec_ver_prop = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION);
spec_ver = axutil_property_get_value(spec_ver_prop, env);
- /*spec_ver_bean = sandesha2_seq_property_bean_create_with_data(env,
- internal_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION, spec_ver);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, spec_ver_bean);*/
}
if(sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
(env, spec_ver))
@@ -788,7 +786,8 @@
msg_num_lng = *(long*)(axutil_property_get_value(property, env));
if(msg_num_lng <= 0)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Invalid message number");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Invalid message number");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1023,29 +1022,17 @@
axis2_msg_ctx_get_op_ctx(msg_ctx, env), env), env), env);
if (to_epr)
to_addr = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
- /* test code */
- /*if(!axis2_msg_ctx_get_wsa_action(msg_ctx, env))
- axis2_msg_ctx_set_wsa_action(msg_ctx, env, axutil_strcat(env, to_addr,
- "/", op_name, NULL));*/
if(!axis2_msg_ctx_get_wsa_action(msg_ctx, env))
axis2_msg_ctx_set_wsa_action(msg_ctx, env, to_addr);
- /*if(!axis2_msg_ctx_get_soap_action(msg_ctx, env))
- axis2_msg_ctx_set_soap_action(msg_ctx, env, axutil_strcat(env, "\"",
- to_addr, "/", op_name, "\"", NULL));*/
if(!axis2_msg_ctx_get_soap_action(msg_ctx, env))
{
axutil_string_t *soap_action = axutil_string_create(env, to_addr);
axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action);
}
- /* end test code */
if(!dummy_msg)
sandesha2_app_msg_processor_process_response_msg(env, rm_msg_ctx,
internal_seq_id, out_seq_id, msg_number, storage_key, storage_mgr);
- /*if(1 < msg_number && !axis2_msg_ctx_get_server_side(msg_ctx, env))
- {
- return AXIS2_SUCCESS;
- }*/
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_app_msg_processor_process_out_msg");
@@ -1263,7 +1250,7 @@
env));
if(!axis2_engine_resume_send(engine, env, create_seq_msg))
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[sandesha2]Engine Resume Send failed");
return AXIS2_FAILURE;
}
@@ -1365,7 +1352,8 @@
rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, storage_mgr);
if(!rm_version)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Unable to find RM spec version");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Unable to find RM spec version");
return AXIS2_FAILURE;
}
rm_ns_val = sandesha2_spec_specific_consts_get_rm_ns_val(env, rm_version);
@@ -1384,7 +1372,8 @@
env, SANDESHA2_MSG_PART_SEQ);
if(!req_seq)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence not found");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Sequence not found");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_SEQ, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -1456,7 +1445,8 @@
req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
if(!req_seq)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence is NULL");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Sequence is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1465,10 +1455,10 @@
sandesha2_seq_get_identifier(req_seq, env), env);
if(!incoming_seq_id)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence ID is NULL");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Sequence ID is NULL");
return AXIS2_FAILURE;
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sandesha to_addr = %s sandesha2_msg_creator_add_ack_msg", to_addr);
sandesha2_msg_creator_add_ack_msg(env, rm_msg_ctx, incoming_seq_id,
storage_mgr);
engine = axis2_engine_create(env, axis2_msg_ctx_get_conf_ctx(msg_ctx,
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=534400&r1=534399&r2=534400
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Wed May 2 04:52:40 2007
@@ -195,7 +195,7 @@
{
axis2_engine_t *engine = NULL;
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]A fault occurred in create_seq_msg_processor_process_in_msg");
+ "[sandesha2]A fault occurred");
engine = axis2_engine_create(env, conf_ctx);
axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx(
fault_rm_msg_ctx, env));
@@ -215,11 +215,11 @@
AXIS2_VALUE_TRUE);
/* For making sure that this won't be processed again */
sandesha2_msg_ctx_set_property(create_seq_res_msg, env,
- SANDESHA2_APPLICATION_PROCESSING_DONE, property);
+ SANDESHA2_APPLICATION_PROCESSING_DONE, property);
create_seq_res_part = (sandesha2_create_seq_res_t*)
- sandesha2_msg_ctx_get_msg_part(create_seq_res_msg,
- env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE);
+ sandesha2_msg_ctx_get_msg_part(create_seq_res_msg,
+ env, SANDESHA2_MSG_PART_CREATE_SEQ_RESPONSE);
seq_offer = sandesha2_create_seq_get_seq_offer(create_seq_part,
env);
/* Offer processing */
@@ -252,8 +252,8 @@
sandesha2_seq_property_bean_t *out_seq_bean = NULL;
sandesha2_seq_property_bean_t *int_seq_bean = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Offer Accepted");
-
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Offer Accepted");
create_seq_bean = sandesha2_create_seq_bean_create(env);
sandesha2_create_seq_bean_set_seq_id(create_seq_bean, env,
offer_seq_id);
@@ -270,10 +270,6 @@
out_seq_bean = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_name(out_seq_bean, env,
SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
- /*sandesha2_seq_property_bean_set_seq_id(out_seq_bean, env,
- offer_seq_id);
- sandesha2_seq_property_bean_set_value(out_seq_bean, env,
- int_seq_id);*/
sandesha2_seq_property_bean_set_seq_id(out_seq_bean, env,
int_seq_id);
sandesha2_seq_property_bean_set_value(out_seq_bean, env,
@@ -302,8 +298,7 @@
if(!acks_to || !axis2_endpoint_ref_get_address(acks_to,
env))
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Acks to is null"
- " in create_seq message");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Acks to is null");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -326,10 +321,10 @@
return AXIS2_FAILURE;
}
to_epr = axis2_endpoint_ref_create(env,
- sandesha2_seq_property_bean_get_value(to_bean, env));
+ sandesha2_seq_property_bean_get_value(to_bean, env));
addr_ns_uri = sandesha2_utils_get_seq_property(env, new_seq_id,
- SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
- storage_mgr);
+ SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
+ storage_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
@@ -352,9 +347,9 @@
static axis2_status_t AXIS2_CALL
sandesha2_create_seq_msg_processor_process_out_msg(
- sandesha2_msg_processor_t *msg_processor,
- const axutil_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx)
+ sandesha2_msg_processor_t *msg_processor,
+ const axutil_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c?view=diff&rev=534400&r1=534399&r2=534400
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed May 2 04:52:40 2007
@@ -213,7 +213,8 @@
{
axis2_engine_t *engine = NULL;
engine = axis2_engine_create(env, conf_ctx);
-
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Send fault occurred");
axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx(
fault_ctx, env));
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
@@ -474,7 +475,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
- "[sandesha2] sandesha2_terminate_msg_processor_process_out_msg .........");
+ "[sandesha2] sandesha2_terminate_msg_processor_process_out_msg.");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=534400&r1=534399&r2=534400
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed May 2 04:52:40 2007
@@ -298,8 +298,10 @@
}
else
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]completed_msgs_bean is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_COMPLETED_MSGS_BEAN_IS_NULL,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
return completed_msg_list;
@@ -307,9 +309,9 @@
AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
sandesha2_ack_mgr_get_svr_completed_msgs_list(
- const axutil_env_t *env,
- axis2_char_t *seq_id,
- sandesha2_seq_property_mgr_t *seq_prop_mgr)
+ const axutil_env_t *env,
+ axis2_char_t *seq_id,
+ sandesha2_seq_property_mgr_t *seq_prop_mgr)
{
sandesha2_seq_property_bean_t *completed_msgs_bean = NULL;
axutil_array_list_t *completed_msg_list = NULL;
@@ -325,6 +327,8 @@
}
else
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]completed_msgs_bean is NULL");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_COMPLETED_MSGS_BEAN_IS_NULL,
AXIS2_FAILURE);
return NULL;
@@ -435,7 +439,6 @@
axis2_msg_ctx_get_to(msg_ctx1, env), env);
if(0 == axutil_strcmp(to, to_str))
continue;
- /*axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((const sandesha2_sender_bean_t *)sender_bean, env);*/
sandesha2_sender_mgr_remove(retrans_mgr, env,
sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
sender_bean, env));
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=534400&r1=534399&r2=534400
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed May 2 04:52:40 2007
@@ -75,16 +75,22 @@
soap_body = axiom_soap_envelope_get_body(envelope, env);
if(!soap_body)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Soap envelope does not have a soap body");
return AXIS2_FAILURE;
}
body_node = axiom_soap_body_get_base_node(soap_body, env);
if(!body_node)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Soap body does not have a base node");
return AXIS2_FAILURE;
}
body_element = axiom_node_get_data_element(body_node, env);
if(!body_element)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Soap body node does not have a node element");
return AXIS2_FAILURE;
}
body_rm_element = axiom_element_get_first_child_with_qname(body_element,
@@ -167,6 +173,7 @@
else
{
axutil_allocator_switch_to_local_pool(env->allocator);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Unknown storage manager");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_STORAGE_MGR,
AXIS2_FAILURE);
return NULL;
@@ -212,6 +219,7 @@
param = axis2_conf_get_param(conf, env, SANDESHA2_SANDESHA_PROPERTY_BEAN);
if(!param)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Configuration not set");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONFIGURATION_NOT_SET,
AXIS2_FAILURE);
return NULL;
@@ -239,8 +247,8 @@
{
axis2_char_t *ret_str = NULL;
- ret_str = axutil_strcat(env, "Invalid String Array", str, NULL);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str);
+ ret_str = axutil_strcat(env, "[sandesha2]Invalid String Array", str, NULL);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, ret_str);
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY,
AXIS2_FAILURE);
AXIS2_FREE(env->allocator, ret_str);
@@ -253,8 +261,8 @@
{
axis2_char_t *ret_str = NULL;
- ret_str = axutil_strcat(env, "Invalid String Array", str, NULL);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str);
+ ret_str = axutil_strcat(env, "[sandesha2]Invalid String Array", str, NULL);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, ret_str);
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY,
AXIS2_FAILURE);
AXIS2_FREE(env->allocator, ret_str);
@@ -267,8 +275,8 @@
{
axis2_char_t *ret_str = NULL;
- ret_str = axutil_strcat(env, "Invalid String Array", str, NULL);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, ret_str);
+ ret_str = axutil_strcat(env, "[sandesha2]Invalid String Array", str, NULL);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, ret_str);
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_STRING_ARRAY,
AXIS2_FAILURE);
AXIS2_FREE(env->allocator, ret_str);
@@ -357,34 +365,39 @@
{
sandesha2_in_order_invoker_t *invoker = NULL;
axutil_property_t *property = NULL;
+ axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
property = axis2_ctx_get_property(axis2_conf_ctx_get_base(conf_ctx, env),
- env, SANDESHA2_INVOKER);
+ env, SANDESHA2_INVOKER);
if(property)
invoker = axutil_property_get_value(property, env);
if(!invoker)
{
invoker = sandesha2_in_order_invoker_create(env);
property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
- AXIS2_FALSE, (void *)sandesha2_in_order_invoker_free_void_arg, invoker);
+ AXIS2_FALSE, (void *)sandesha2_in_order_invoker_free_void_arg,
+ invoker);
axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env),
- env, SANDESHA2_INVOKER, property);
+ env, SANDESHA2_INVOKER, property);
}
- sandesha2_in_order_invoker_run_for_seq(invoker, env, conf_ctx, seq_id);
- return AXIS2_SUCCESS;
+ status = sandesha2_in_order_invoker_run_for_seq(invoker, env, conf_ctx,
+ seq_id);
+ return status;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_utils_start_sender_for_seq(const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id)
+sandesha2_utils_start_sender_for_seq(
+ const axutil_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id)
{
sandesha2_sender_t *sender = NULL;
axutil_property_t *property = NULL;
+ axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
@@ -403,8 +416,8 @@
axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_SENDER, property);
}
- sandesha2_sender_run_for_seq(sender, env, conf_ctx, seq_id);
- return AXIS2_SUCCESS;
+ status = sandesha2_sender_run_for_seq(sender, env, conf_ctx, seq_id);
+ return status;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -414,6 +427,7 @@
{
sandesha2_polling_mgr_t *polling_mgr = NULL;
axutil_property_t *property = NULL;
+ axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
@@ -434,20 +448,21 @@
axis2_ctx_set_property(axis2_conf_ctx_get_base(conf_ctx, env),
env, SANDESHA2_POLLING_MGR, property);
}
- sandesha2_polling_mgr_start(polling_mgr, env, conf_ctx);
- return AXIS2_SUCCESS;
+ status = sandesha2_polling_mgr_start(polling_mgr, env, conf_ctx);
+ return status;
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_outgoing_internal_seq_id(const axutil_env_t *env,
+sandesha2_utils_get_outgoing_internal_seq_id(
+ const axutil_env_t *env,
axis2_char_t *seq_id)
{
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, seq_id, NULL);
return axutil_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":",
- seq_id, NULL);
+ seq_id, NULL);
}
AXIS2_EXTERN axis2_transport_out_desc_t* AXIS2_CALL
@@ -465,8 +480,9 @@
}
AXIS2_EXTERN sandesha2_storage_mgr_t* AXIS2_CALL
-sandesha2_utils_get_inmemory_storage_mgr(const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
+sandesha2_utils_get_inmemory_storage_mgr(
+ const axutil_env_t *env,
+ axis2_conf_ctx_t *conf_ctx)
{
axutil_property_t *property = NULL;
axis2_ctx_t *ctx = axis2_conf_ctx_get_base(conf_ctx, env);
@@ -504,7 +520,6 @@
{
axutil_property_t *property = NULL;
axis2_ctx_t *ctx = axis2_conf_ctx_get_base(conf_ctx, env);
- /*axutil_array_list_t *storage_mgr_list = axutil_array_list_create(env, 0);*/
sandesha2_storage_mgr_t *storage_mgr = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -519,15 +534,6 @@
AXIS2_FALSE, 0, storage_mgr);
axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
property);
- /*if(property)
- storage_mgr_list = axutil_property_get_value(property, env);
- sandesha2_storage_mgr_t *storage_mgr =
- sandesha2_permanent_storage_mgr_create(env, conf_ctx);
- axutil_array_list_add(storage_mgr_list, env, storage_mgr);
- property = axutil_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
- AXIS2_FALSE, 0, storage_mgr_list);
- axis2_ctx_set_property(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
- property, AXIS2_FALSE);*/
return storage_mgr;
}
@@ -565,6 +571,8 @@
param = axis2_op_get_param(op, env, SANDESHA2_SANDESHA_PROPERTY_BEAN);
if(!param)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Configuration not set.");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONFIGURATION_NOT_SET,
AXIS2_FAILURE);
return NULL;
@@ -598,7 +606,7 @@
else
{
ret = axutil_strcat(env, SANDESHA2_INTERNAL_SEQ_PREFIX, ":", to, ":",
- seq_key, NULL);
+ seq_key, NULL);
return ret;
}
return NULL;
@@ -673,7 +681,8 @@
if(axis2_msg_ctx_get_svc(ref_msg, env))
{
- axis2_msg_ctx_set_svc_grp(new_msg, env, (axis2_svc_grp_t *)axis2_msg_ctx_get_svc(ref_msg, env));
+ axis2_msg_ctx_set_svc_grp(new_msg, env, (axis2_svc_grp_t *)
+ axis2_msg_ctx_get_svc(ref_msg, env));
if(axis2_msg_ctx_get_svc_ctx(ref_msg, env))
{
axis2_msg_ctx_set_svc_ctx(new_msg, env,
@@ -873,7 +882,7 @@
if(!soap_env)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] SOAP envelope is"
- " null");
+ " NULL");
return AXIS2_FALSE;
}
soap_header = axiom_soap_envelope_get_header(soap_env, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org