You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/10/31 08:55:33 UTC
svn commit: r469402 [2/2] - in /webservices/sandesha/trunk/c: ./ include/
samples/client/rm_echo/ samples/client/rm_echo_blocking/
samples/client/rm_ping/ src/core/ src/handlers/ src/msgprocessors/
src/storage/beans/ src/storage/inmemory/ src/util/ src...
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=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Mon Oct 30 23:55:32 2006
@@ -59,45 +59,35 @@
((sandesha2_app_msg_processor_impl_t *)(msg_proc))
/***************************** Function headers *******************************/
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_process_in_msg (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *msg_ctx);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_process_out_msg(
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *msg_ctx);
-
-axis2_bool_t AXIS2_CALL
+
+
+static axis2_bool_t AXIS2_CALL
sandesha2_app_msg_processor_msg_num_is_in_list(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *list,
long num);
-
-axis2_status_t AXIS2_CALL
-sandesha2_app_msg_processor_send_ack_if_reqd(
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *msg_ctx,
- axis2_char_t *msg_str,
- sandesha2_storage_mgr_t *mgr);
-
-axis2_status_t AXIS2_CALL
+
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_add_create_seq_msg(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *msg_ctx,
axis2_char_t *internal_seq_id,
axis2_char_t *acks_to,
sandesha2_storage_mgr_t *mgr);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_process_response_msg(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *msg_ctx,
axis2_char_t *internal_seq_id,
@@ -105,22 +95,20 @@
axis2_char_t *storage_key,
sandesha2_storage_mgr_t *mgr);
-long AXIS2_CALL
+static long AXIS2_CALL
sandesha2_app_msg_processor_get_prev_msg_no(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
sandesha2_storage_mgr_t *mgr);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_set_next_msg_no(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
long msg_num,
sandesha2_storage_mgr_t *mgr);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_free (
sandesha2_msg_processor_t *element,
const axis2_env_t *env);
@@ -138,7 +126,7 @@
(env->allocator,
sizeof(sandesha2_app_msg_processor_impl_t));
- if(NULL == msg_proc_impl)
+ if(!msg_proc_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -146,7 +134,7 @@
msg_proc_impl->msg_processor.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_msg_processor_ops_t));
- if(NULL == msg_proc_impl->msg_processor.ops)
+ if(!msg_proc_impl->msg_processor.ops)
{
sandesha2_app_msg_processor_free((sandesha2_msg_processor_t*)
msg_proc_impl, env);
@@ -164,7 +152,7 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_free (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env)
@@ -173,7 +161,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
msg_proc_impl = SANDESHA2_INTF_TO_IMPL(msg_processor);
- if(NULL != msg_processor->ops)
+ if(msg_processor->ops)
AXIS2_FREE(env->allocator, msg_processor->ops);
AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(msg_processor));
@@ -181,7 +169,7 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_process_in_msg (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
@@ -197,7 +185,7 @@
axis2_property_t *property = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_msg_ctx_t *fault_ctx = NULL;
- sandesha2_fault_mgr_t *fault_man = NULL;
+ sandesha2_fault_mgr_t *fault_mgr = NULL;
sandesha2_seq_t *seq = NULL;
axis2_char_t *str_seq_id = NULL;
sandesha2_seq_property_bean_t *msgs_bean = NULL;
@@ -217,10 +205,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] sandesha2_app_msg_processor_process_in_msg .........");
+ printf("sandesha2_app_msg_processor_process_in_msg\n");
seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx,
env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
- if(NULL != seq_ack)
+ if(seq_ack)
{
sandesha2_msg_processor_t *ack_proc = NULL;
ack_proc = sandesha2_ack_msg_processor_create(env);
@@ -229,7 +220,7 @@
ack_requested = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
- if(NULL != ack_requested)
+ if(ack_requested)
{
SANDESHA2_ACK_REQUESTED_SET_MUST_UNDERSTAND(ack_requested, env,
AXIS2_FALSE);
@@ -237,7 +228,7 @@
}
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
- if(NULL == msg_ctx)
+ if(!msg_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
AXIS2_FAILURE);
@@ -246,20 +237,20 @@
property = SANDESHA2_MSG_CTX_GET_PROPERTY(rm_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE);
- if(NULL != property)
+ if(property)
{
processed = AXIS2_PROPERTY_GET_VALUE(property, env);
}
- if(NULL != processed && 0 == AXIS2_STRCMP(processed, "true"))
+ if(processed && 0 == AXIS2_STRCMP(processed, "true"))
{
return AXIS2_SUCCESS;
}
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if (NULL != op_ctx)
+ if (op_ctx)
{
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- if (NULL != ctx)
+ if (ctx)
{
axis2_char_t *value = NULL;
@@ -274,10 +265,10 @@
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- fault_man = sandesha2_fault_mgr_create(env);
+ fault_mgr = sandesha2_fault_mgr_create(env);
fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(
- fault_man, env, rm_msg_ctx, storage_mgr);
- if(NULL != fault_ctx)
+ fault_mgr, env, rm_msg_ctx, storage_mgr);
+ if(fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
@@ -297,9 +288,9 @@
SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
str_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
- fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_man, env,
+ fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_UNKNOWN_SEQ(fault_mgr, env,
rm_msg_ctx, str_seq_id, storage_mgr);
- if(NULL != fault_ctx)
+ if(fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
@@ -314,9 +305,9 @@
}
SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
- fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_man, env,
+ fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_mgr, env,
rm_msg_ctx, str_seq_id, storage_mgr);
- if(NULL != fault_ctx)
+ if(fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
if(AXIS2_FAILURE == AXIS2_ENGINE_SEND_FAULT(engine, env,
@@ -347,11 +338,11 @@
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER, storage_mgr);
highest_in_msg_key_str = sandesha2_utils_get_seq_property(env, str_seq_id,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_KEY, storage_mgr);
- if(NULL == highest_in_msg_key_str)
+ if(!highest_in_msg_key_str)
{
highest_in_msg_key_str = axis2_uuid_gen(env);
}
- if(NULL != highest_in_msg_no_str)
+ if(highest_in_msg_no_str)
{
highest_in_msg_no = atol(highest_in_msg_no_str);
}
@@ -371,10 +362,9 @@
highest_in_msg_key_str);
SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env,
highest_in_msg_key_str);
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env,
highest_in_msg_key_str, msg_ctx);
- if(NULL != highest_in_msg_no_str)
+ if(highest_in_msg_no_str)
{
SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
highest_msg_no_bean);
@@ -390,8 +380,10 @@
}
}
- if(NULL != msgs_bean)
+ if(msgs_bean)
+ {
msgs_str = SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(msgs_bean, env);
+ }
else
{
msgs_bean = sandesha2_seq_property_bean_create(env);
@@ -400,18 +392,16 @@
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(msgs_bean, env, msgs_str);
}
- /*if(AXIS2_TRUE == sandesha2_app_msg_processor_msg_num_is_in_list(
- msg_processor, env, msgs_str, msg_no) &&
- 0 == AXIS2_STRCMP(SANDESHA2_QOS_DEFAULT_INVOCATION_TYPE,
- SANDESHA2_QOS_EXACTLY_ONCE))
+ if(sandesha2_app_msg_processor_msg_num_is_in_list(env, msgs_str, msg_no) &&
+ 0 == AXIS2_STRCMP(SANDESHA2_QOS_DEFAULT_INVOCATION_TYPE,
+ SANDESHA2_QOS_EXACTLY_ONCE))
{
SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
- }*/
- if(NULL != msgs_str && 0 < AXIS2_STRLEN(msgs_str))
+ }
+ if(msgs_str && 0 < AXIS2_STRLEN(msgs_str))
msgs_str = axis2_strcat(env, msgs_str, ",", msg_num_str, NULL);
else
msgs_str = AXIS2_STRDUP(msg_num_str, env);
-
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(msgs_bean, env, msgs_str);
SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env, msgs_bean);
@@ -419,7 +409,7 @@
env);
next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(next_mgr, env,
str_seq_id);
- if(NULL == next_msg_bean)
+ if(!next_msg_bean)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SEQ_NOT_EXIST,
AXIS2_FAILURE);
@@ -430,10 +420,7 @@
in_order_invoke = SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(
sandesha2_utils_get_property_bean(env,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env)), env);
- /*if(AXIS2_TRUE == in_order_invoke)*/
- /* test code */
- if(AXIS2_TRUE != in_order_invoke)
- /* end test code */
+ if(in_order_invoke)
{
sandesha2_seq_property_bean_t *incoming_seq_list_bean = NULL;
axis2_array_list_t *incoming_seq_list = NULL;
@@ -443,7 +430,7 @@
incoming_seq_list_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(
seq_prop_mgr, env, SANDESHA2_SEQ_PROP_ALL_SEQS,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
- if(NULL == incoming_seq_list_bean)
+ if(!incoming_seq_list_bean)
{
/**
* Our array to_string format is [ele1,ele2,ele3]
@@ -463,14 +450,14 @@
incoming_seq_list_bean, env);
incoming_seq_list = sandesha2_utils_get_array_list_from_string(env,
str_value);
- if(NULL == incoming_seq_list)
+ if(!incoming_seq_list)
{
axis2_status_t status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
if(AXIS2_SUCCESS != status)
return status;
}
/* Adding current seq to the incoming seq List */
- if(AXIS2_FALSE == sandesha2_utils_array_list_contains(env,
+ if(!sandesha2_utils_array_list_contains(env,
incoming_seq_list, str_seq_id))
{
axis2_char_t *str_seq_list = NULL;
@@ -485,7 +472,6 @@
incoming_seq_list_bean);
}
/* save the message */
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, str_key,
msg_ctx);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
@@ -502,17 +488,19 @@
/* Start the invoker if stopped */
sandesha2_utils_start_invoker_for_seq(env, conf_ctx, str_seq_id);
}
- sandesha2_app_msg_processor_send_ack_if_reqd(msg_processor, env, rm_msg_ctx,
- msgs_str, storage_mgr);
- if(AXIS2_TRUE == AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
+ sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
+ storage_mgr);
+ /*if(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))
{
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_FALSE);
- }
+ }*/
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] Exit: sandesha2_app_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_process_out_msg(
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
@@ -545,8 +533,10 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] sandesha2_app_msg_processor_process_out_msg .........");
+ printf("sandesha2_app_msg_processor_process_out_msg\n");
- printf("In Application Message Processor*************************************** \n");
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
/* TODO setting up fault callback */
@@ -649,8 +639,8 @@
return AXIS2_FAILURE;
}
}
- system_msg_num = sandesha2_app_msg_processor_get_prev_msg_no(msg_processor,
- env, internal_seq_id, storage_mgr);
+ system_msg_num = sandesha2_app_msg_processor_get_prev_msg_no(env,
+ internal_seq_id, storage_mgr);
if(msg_num_lng > 0 && msg_num_lng <= system_msg_num)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM,
@@ -675,8 +665,8 @@
SANDESHA2_VALUE_TRUE))
dummy_msg = AXIS2_TRUE;
if(AXIS2_FALSE == dummy_msg)
- sandesha2_app_msg_processor_set_next_msg_no(msg_processor, env,
- internal_seq_id, msg_number, storage_mgr);
+ sandesha2_app_msg_processor_set_next_msg_no(env, internal_seq_id,
+ msg_number, storage_mgr);
sprintf(msg_number_str, "%ld", msg_number);
res_highest_msg_bean = sandesha2_seq_property_bean_create_with_data(env,
@@ -843,8 +833,8 @@
* else if()
* TODO handle acks_to == anon_uri case
*/
- sandesha2_app_msg_processor_add_create_seq_msg(msg_processor, env,
- rm_msg_ctx, internal_seq_id, acks_to, storage_mgr);
+ sandesha2_app_msg_processor_add_create_seq_msg(env, rm_msg_ctx,
+ internal_seq_id, acks_to, storage_mgr);
}
}
soap_env = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env);
@@ -905,16 +895,16 @@
to_addr, "/", op_name, "\"", NULL));
if(AXIS2_FALSE == dummy_msg)
- sandesha2_app_msg_processor_process_response_msg(msg_processor, env,
- rm_msg_ctx, internal_seq_id, msg_number, storage_key,
- storage_mgr);
+ sandesha2_app_msg_processor_process_response_msg(env, rm_msg_ctx,
+ internal_seq_id, msg_number, storage_key, storage_mgr);
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] Exit: sandesha2_app_msg_processor_process_out_msg");
return AXIS2_SUCCESS;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_app_msg_processor_msg_num_is_in_list(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *list,
long num)
@@ -934,7 +924,6 @@
axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_send_ack_if_reqd(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *msg_str,
@@ -959,14 +948,14 @@
SANDESHA2_SEQ_GET_IDENTIFIER(seq, env), env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx,
env), env);
- if(NULL == conf_ctx)
+ if(!conf_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONF_CTX_NULL, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
ack_requested = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
- if(NULL != ack_requested)
+ if(ack_requested)
{
SANDESHA2_ACK_REQUESTED_SET_MUST_UNDERSTAND(ack_requested, env,
AXIS2_FALSE);
@@ -984,9 +973,8 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_add_create_seq_msg(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *internal_seq_id,
@@ -1092,7 +1080,6 @@
SANDESHA2_MSG_TYPE_CREATE_SEQ);
SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env,
create_seq_entry);
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(create_seq_msg, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, str_key, create_seq_msg);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -1124,9 +1111,8 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_process_response_msg(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *internal_seq_id,
@@ -1193,10 +1179,10 @@
{
axis2_endpoint_ref_t *reply_to = NULL;
- /*req_msg = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env),
+ req_msg = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env),
env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
- reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(req_msg, env);*/
- reply_to = AXIS2_MSG_CTX_GET_TO(app_msg_ctx, env);
+ if(req_msg)
+ reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(req_msg, env);
if(reply_to)
new_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
reply_to, env);
@@ -1225,19 +1211,11 @@
if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(app_msg_ctx, env))
{
- axis2_op_ctx_t *op_ctx = NULL;
- axis2_ctx_t *ctx = NULL;
- axis2_property_t *property = NULL;
sandesha2_msg_ctx_t *req_rm_msg = NULL;
req_rm_msg = sandesha2_msg_init_init_msg(env, req_msg);
req_seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(req_rm_msg,
env, SANDESHA2_MSG_PART_SEQ);
- /*op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env);
- ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- property = AXIS2_CTX_GET_PROPERTY(ctx, env, SANDESHA2_WSRM_COMMON_SEQ,
- AXIS2_FALSE);
- req_seq = (sandesha2_seq_t *) AXIS2_PROPERTY_GET_VALUE(property, env);*/
if(NULL == req_seq)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Sequence not found");
@@ -1256,7 +1234,6 @@
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_property_t *property = NULL;
- axis2_ctx_t *ctx = NULL;
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env);
if(NULL != op_ctx)
@@ -1323,7 +1300,6 @@
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
SANDESHA2_SENDER_BEAN_SET_INTERNAL_SEQ_ID(app_msg_entry, env, internal_seq_id);
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(app_msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, storage_key, app_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env, app_msg_entry);
@@ -1360,14 +1336,12 @@
AXIS2_MSG_CTX_SET_CURRENT_HANDLER_INDEX(app_msg_ctx, env,
AXIS2_MSG_CTX_GET_CURRENT_HANDLER_INDEX(app_msg_ctx, env) + 1);
engine = axis2_engine_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(app_msg_ctx, env));
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(app_msg_ctx, env, AXIS2_FALSE);*/
return AXIS2_ENGINE_RESUME_SEND(engine, env, app_msg_ctx);
}
-long AXIS2_CALL
+static long AXIS2_CALL
sandesha2_app_msg_processor_get_prev_msg_no(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
sandesha2_storage_mgr_t *mgr)
@@ -1399,9 +1373,8 @@
return next_msg_no;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_set_next_msg_no(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *internal_seq_id,
long msg_num,
@@ -1450,3 +1423,4 @@
}
return AXIS2_SUCCESS;
}
+
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=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Mon Oct 30 23:55:32 2006
@@ -62,34 +62,35 @@
((sandesha2_create_seq_msg_processor_impl_t *)(msg_proc))
/***************************** Function headers *******************************/
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_msg_processor_process_in_msg (
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx);
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_msg_processor_process_out_msg(
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx);
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_create_seq_msg_processor_offer_accepted(
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- sandesha2_storage_mgr_t *storage_mgr);
-
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_msg_processor_free (sandesha2_msg_processor_t *element,
- const axis2_env_t *env);
+ const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_storage_mgr_t *storage_mgr);
+
+static axis2_status_t AXIS2_CALL
+sandesha2_create_seq_msg_processor_free (
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_msg_processor_t* AXIS2_CALL
-sandesha2_create_seq_msg_processor_create(const axis2_env_t *env)
+sandesha2_create_seq_msg_processor_create(
+ const axis2_env_t *env)
{
sandesha2_create_seq_msg_processor_impl_t *msg_proc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -124,9 +125,10 @@
}
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_msg_processor_free (sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env)
+static axis2_status_t AXIS2_CALL
+sandesha2_create_seq_msg_processor_free (
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env)
{
sandesha2_create_seq_msg_processor_impl_t *msg_proc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -140,11 +142,11 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_msg_processor_process_in_msg (
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx)
{
axis2_msg_ctx_t *msg_ctx = NULL;
sandesha2_create_seq_t *create_seq_part = NULL;
@@ -170,6 +172,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] sandesha2_create_seq_msg_processor_process_in_msg .........");
+ printf("sandesha2_create_seq_msg_processor_process_in_msg\n");
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
create_seq_part = (sandesha2_create_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
@@ -241,7 +246,7 @@
offer_seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
SANDESHA2_SEQ_OFFER_GET_IDENTIFIER(seq_offer, env), env);
offer_accepted = sandesha2_create_seq_msg_processor_offer_accepted(
- msg_processor, env, offer_seq_id, rm_msg_ctx,
+ env, offer_seq_id, rm_msg_ctx,
storage_mgr);
if(AXIS2_TRUE == offer_accepted)
{
@@ -326,11 +331,13 @@
AXIS2_FALSE);
SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] Exit: sandesha2_create_seq_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_msg_processor_process_out_msg(
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
@@ -347,13 +354,12 @@
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_create_seq_msg_processor_offer_accepted(
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- sandesha2_storage_mgr_t *storage_mgr)
+ const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_storage_mgr_t *storage_mgr)
{
sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
sandesha2_create_seq_bean_t *find_bean = NULL;
@@ -377,3 +383,4 @@
return AXIS2_TRUE;
}
+
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Mon Oct 30 23:55:32 2006
@@ -67,29 +67,28 @@
((sandesha2_create_seq_res_msg_processor_impl_t *)(msg_proc))
/***************************** Function headers *******************************/
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_process_in_msg (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_process_out_msg(
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx);
-
-axis2_bool_t AXIS2_CALL
+/*
+static axis2_bool_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_offer_accepted(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_char_t *seq_id,
sandesha2_msg_ctx_t *rm_msg_ctx,
sandesha2_storage_mgr_t *storage_mgr);
-
-axis2_status_t AXIS2_CALL
+*/
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_free (
- sandesha2_msg_processor_t *element,
+ sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env);
/***************************** End of function headers ************************/
@@ -132,7 +131,7 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_free (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env)
@@ -149,7 +148,7 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_process_in_msg (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
@@ -162,7 +161,7 @@
sandesha2_create_seq_res_t *csr_part = NULL;
axis2_char_t *new_out_seq_id = NULL;
axis2_relates_to_t *relates_to = NULL;
- axis2_char_t *create_seq_msg_id = NULL;
+ const axis2_char_t *create_seq_msg_id = NULL;
sandesha2_sender_mgr_t *retrans_mgr = NULL;
sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
@@ -181,6 +180,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] sandesha2_create_seq_res_msg_processor_process_in_msg .........");
+ printf("sandesha2_create_seq_res_msg_processor_process_in_msg\n");
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
@@ -417,11 +419,13 @@
AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
AXIS2_FALSE);
SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] Exit: sandesha2_create_seq_res_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_msg_processor_process_out_msg(
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
@@ -436,3 +440,4 @@
*/
return AXIS2_SUCCESS;
}
+
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=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Mon Oct 30 23:55:32 2006
@@ -65,38 +65,36 @@
(msg_proc))
/***************************** Function headers *******************************/
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_process_in_msg (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_process_out_msg(
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_setup_highest_msg_nums(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
sandesha2_storage_mgr_t *storage_man,
axis2_char_t *seq_id,
sandesha2_msg_ctx_t *rm_msg_ctx);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_add_terminate_seq_res(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *seq_id,
sandesha2_storage_mgr_t *storage_man);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_free (
- sandesha2_msg_processor_t *element,
+ sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env);
/***************************** End of function headers ************************/
@@ -139,7 +137,7 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_free (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env)
@@ -156,7 +154,7 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_process_in_msg (
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
@@ -177,8 +175,10 @@
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_in_msg .........");
+ printf("sandesha2_terminate_msg_processor_process_in_msg\n");
- printf("In terminate_seq_msg_processor\n");
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
@@ -236,10 +236,10 @@
spec_version = SANDESHA2_MSG_CTX_GET_RM_SPEC_VER(rm_msg_ctx, env);
if(AXIS2_TRUE == sandesha2_spec_specific_consts_is_term_seq_res_reqd(env,
spec_version))
- sandesha2_terminate_seq_msg_processor_add_terminate_seq_res(
- msg_processor, env, rm_msg_ctx, seq_id, storage_man);
- sandesha2_terminate_seq_msg_processor_setup_highest_msg_nums(msg_processor,
- env, conf_ctx, storage_man, seq_id, rm_msg_ctx);
+ sandesha2_terminate_seq_msg_processor_add_terminate_seq_res(env,
+ rm_msg_ctx, seq_id, storage_man);
+ sandesha2_terminate_seq_msg_processor_setup_highest_msg_nums(env, conf_ctx,
+ storage_man, seq_id, rm_msg_ctx);
sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx,
seq_id, storage_man);
transmit_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
@@ -248,14 +248,15 @@
sandesha2_seq_mgr_update_last_activated_time(env, seq_id, storage_man);
SANDESHA2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] Exit: sandesha2_terminate_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_setup_highest_msg_nums(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
sandesha2_storage_mgr_t *storage_man,
@@ -358,9 +359,8 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_add_terminate_seq_res(
- sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
axis2_char_t *seq_id,
@@ -430,7 +430,7 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_msg_processor_process_out_msg(
sandesha2_msg_processor_t *msg_processor,
const axis2_env_t *env,
@@ -462,6 +462,9 @@
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 .........");
+ printf("sandesha2_terminate_msg_processor_process_out_msg\n");
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
@@ -556,8 +559,8 @@
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(term_bean, env,
sandesha2_utils_get_current_time_in_millis(env) +
SANDESHA2_TERMINATE_DELAY);
- SANDESHA2_SENDER_BEAN_SET_MSG_ID(term_bean, env, AXIS2_MSG_CTX_GET_MSG_ID(
- msg_ctx, env));
+ SANDESHA2_SENDER_BEAN_SET_MSG_ID(term_bean, env,
+ (axis2_char_t *) AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env));
SANDESHA2_SENDER_BEAN_SET_SEND(term_bean, env, AXIS2_TRUE);
property = axis2_property_create(env);
@@ -608,6 +611,8 @@
sandesha2_utils_get_transport_out(env));
engine = axis2_engine_create(env, conf_ctx);
AXIS2_ENGINE_SEND(engine, env, msg_ctx);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2] Exit: sandesha2_terminate_msg_processor_process_out_msg");
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c Mon Oct 30 23:55:32 2006
@@ -33,26 +33,28 @@
(msg_proc))
/***************************** Function headers *******************************/
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_res_msg_processor_process_in_msg (
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx);
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_res_msg_processor_process_out_msg(
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx);
-
-axis2_status_t AXIS2_CALL
-sandesha2_terminate_seq_res_msg_processor_free (sandesha2_msg_processor_t *element,
- const axis2_env_t *env);
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
+
+static axis2_status_t AXIS2_CALL
+sandesha2_terminate_seq_res_msg_processor_free (
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_msg_processor_t* AXIS2_CALL
-sandesha2_terminate_seq_res_msg_processor_create(const axis2_env_t *env)
+sandesha2_terminate_seq_res_msg_processor_create(
+ const axis2_env_t *env)
{
sandesha2_terminate_seq_res_msg_processor_impl_t *msg_proc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -88,9 +90,10 @@
}
-axis2_status_t AXIS2_CALL
-sandesha2_terminate_seq_res_msg_processor_free (sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env)
+static axis2_status_t AXIS2_CALL
+sandesha2_terminate_seq_res_msg_processor_free (
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env)
{
sandesha2_terminate_seq_res_msg_processor_impl_t *msg_proc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -104,11 +107,11 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_res_msg_processor_process_in_msg (
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
@@ -117,11 +120,11 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_terminate_seq_res_msg_processor_process_out_msg(
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -129,3 +132,4 @@
return AXIS2_SUCCESS;
}
+
Modified: webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c Mon Oct 30 23:55:32 2006
@@ -90,6 +90,7 @@
bean->o_bean.ops->get_seq_id = sandesha2_next_msg_bean_get_seq_id;
bean->o_bean.ops->set_seq_id = sandesha2_next_msg_bean_set_seq_id;
bean->o_bean.ops->set_next_msg_no_to_process = sandesha2_next_msg_bean_set_next_msg_no_to_process;
+ bean->o_bean.ops->get_next_msg_no_to_process = sandesha2_next_msg_bean_get_next_msg_no_to_process;
return &(bean->o_bean);
}
@@ -129,6 +130,7 @@
bean->o_bean.ops->get_seq_id = sandesha2_next_msg_bean_get_seq_id;
bean->o_bean.ops->set_seq_id = sandesha2_next_msg_bean_set_seq_id;
bean->o_bean.ops->set_next_msg_no_to_process = sandesha2_next_msg_bean_set_next_msg_no_to_process;
+ bean->o_bean.ops->get_next_msg_no_to_process = sandesha2_next_msg_bean_get_next_msg_no_to_process;
return &(bean->o_bean);
}
Modified: webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c Mon Oct 30 23:55:32 2006
@@ -225,9 +225,10 @@
void AXIS2_CALL
- sandesha2_seq_property_bean_set_seq_id (struct sandesha2_seq_property_bean *seq_property,
- const axis2_env_t *env,
- axis2_char_t *seq_id)
+sandesha2_seq_property_bean_set_seq_id (
+ struct sandesha2_seq_property_bean *seq_property,
+ const axis2_env_t *env,
+ axis2_char_t *seq_id)
{
sandesha2_seq_property_bean_impl_t *bean_impl = NULL;
bean_impl = AXIS2_INTF_TO_IMPL(seq_property);
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/create_seq_mgr.c Mon Oct 30 23:55:32 2006
@@ -60,7 +60,7 @@
sandesha2_create_seq_mgr_retrieve(
sandesha2_create_seq_mgr_t *seq_mgr,
const axis2_env_t *env,
- axis2_char_t *msg_id);
+ const axis2_char_t *msg_id);
axis2_bool_t AXIS2_CALL
sandesha2_create_seq_mgr_update(
@@ -221,7 +221,7 @@
sandesha2_create_seq_mgr_retrieve(
sandesha2_create_seq_mgr_t *seq_mgr,
const axis2_env_t *env,
- axis2_char_t *msg_id)
+ const axis2_char_t *msg_id)
{
sandesha2_create_seq_mgr_impl_t *seq_mgr_impl = NULL;
sandesha2_create_seq_bean_t *bean = NULL;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c Mon Oct 30 23:55:32 2006
@@ -55,13 +55,13 @@
sandesha2_sender_mgr_remove(
sandesha2_sender_mgr_t *sender,
const axis2_env_t *env,
- axis2_char_t *msg_id);
+ const axis2_char_t *msg_id);
sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_sender_mgr_retrieve(
sandesha2_sender_mgr_t *sender,
const axis2_env_t *env,
- axis2_char_t *msg_id);
+ const axis2_char_t *msg_id);
axis2_bool_t AXIS2_CALL
sandesha2_sender_mgr_update(
@@ -248,7 +248,7 @@
sandesha2_sender_mgr_remove(
sandesha2_sender_mgr_t *sender,
const axis2_env_t *env,
- axis2_char_t *msg_id)
+ const axis2_char_t *msg_id)
{
sandesha2_sender_mgr_impl_t *sender_impl = NULL;
@@ -266,7 +266,7 @@
sandesha2_sender_mgr_retrieve(
sandesha2_sender_mgr_t *sender,
const axis2_env_t *env,
- axis2_char_t *msg_id)
+ const axis2_char_t *msg_id)
{
sandesha2_sender_mgr_impl_t *sender_impl = NULL;
sandesha2_sender_bean_t *bean = NULL;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/seq_property_mgr.c Mon Oct 30 23:55:32 2006
@@ -314,7 +314,6 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
seq_property_impl = SANDESHA2_INTF_TO_IMPL(seq_property);
-
id = sandesha2_seq_property_mgr_get_id(seq_property, env, bean);
if(!id)
{
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=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Mon Oct 30 23:55:32 2006
@@ -33,10 +33,10 @@
AXIS2_EXTERN sandesha2_msg_ctx_t *AXIS2_CALL
sandesha2_ack_mgr_generate_ack_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *ref_rm_msg,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_mgr)
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *ref_rm_msg,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_mgr)
{
axis2_msg_ctx_t *ref_msg = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
@@ -66,9 +66,9 @@
acks_to = axis2_endpoint_ref_create(env,
SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(acks_to_bean,
env));
- if(NULL != acks_to)
+ if(acks_to)
acks_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env);
- if(NULL == acks_to_str)
+ if(!acks_to_str)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR, AXIS2_FAILURE);
return NULL;
@@ -77,13 +77,13 @@
AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(ack_op, env, AXIS2_MEP_URI_OUT_ONLY);
ref_op = AXIS2_MSG_CTX_GET_OP(ref_msg, env);
- if(NULL != ref_op)
+ if(ref_op)
{
axis2_array_list_t *out_flows = NULL;
axis2_array_list_t *out_fault_flows = NULL;
out_flows = AXIS2_OP_GET_OUT_FLOW(ref_op, env);
out_fault_flows = AXIS2_OP_GET_FAULT_OUT_FLOW(ref_op, env);
- if(NULL != out_flows)
+ if(out_flows)
{
AXIS2_OP_SET_OUT_FLOW(ack_op, env, out_flows);
AXIS2_OP_SET_FAULT_OUT_FLOW(ack_op, env, out_fault_flows);
@@ -146,7 +146,7 @@
axis2_op_ctx_t *op_ctx = NULL;
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(ref_msg, env);
- if(NULL == op_ctx)
+ if(!op_ctx)
{
axis2_op_t *op = axis2_op_create(env);
AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_IN_OUT);
@@ -234,7 +234,6 @@
old_ack_bean, env));
}
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(ack_bean, env, time_to_send);
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(ack_msg_ctx, env, AXIS2_TRUE);*/
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_mgr, env, key, ack_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retrans_mgr, env, ack_bean);
@@ -386,8 +385,10 @@
sprintf(tmp, "%ld", start);
ack_range = axis2_hash_get(hash, tmp, AXIS2_HASH_KEY_STRING);
- if(NULL == ack_range)
+ if(!ack_range)
+ {
break;
+ }
if(SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env) >= last_msg_no)
return AXIS2_TRUE;
start = SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env) + 1;
@@ -446,7 +447,7 @@
axis2_msg_ctx_t *msg_ctx1 = NULL;
axis2_char_t *to = NULL;
sandesha2_msg_ctx_t *ack_rm_msg = NULL;
- sandesha2_seq_ack_t *seq_ack = NULL;
+ sandesha2_iom_rm_part_t *seq_ack = NULL;
msg_ctx1 = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_mgr, env,
SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
@@ -465,7 +466,7 @@
" ack message entry");
return AXIS2_FAILURE;
}
- seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ seq_ack = (sandesha2_iom_rm_part_t *)SANDESHA2_MSG_CTX_GET_MSG_PART(
ack_rm_msg, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT, seq_ack);
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Mon Oct 30 23:55:32 2006
@@ -392,7 +392,7 @@
axiom_soap_envelope_t *temp_envelope = NULL;
sandesha2_close_seq_t *cs = NULL;
sandesha2_msg_ctx_t *close_seq_response = NULL;
- sandesha2_close_seq_res_t *response = NULL;
+ sandesha2_iom_rm_part_t *response = NULL;
sandesha2_identifier_t *identifier = NULL;
sandesha2_identifier_t *temp_identifier = NULL;
int soap_version = -1;
@@ -406,10 +406,10 @@
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(temp_identifier, env);
ns = SANDESHA2_MSG_CTX_GET_RM_NS_VAL(close_seq_msg, env);
SANDESHA2_MSG_CTX_SET_RM_NS_VAL(close_seq_response, env, ns);
- response = sandesha2_close_seq_res_create(env, ns);
+ response = (sandesha2_iom_rm_part_t *) sandesha2_close_seq_res_create(env, ns);
identifier = sandesha2_identifier_create(env, ns);
SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, seq_id);
- SANDESHA2_CLOSE_SEQ_RES_SET_IDENTIFIER(response, env, identifier);
+ SANDESHA2_CLOSE_SEQ_RES_SET_IDENTIFIER((sandesha2_close_seq_res_t *) response, env, identifier);
temp_envelope = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(close_seq_msg, env);
soap_version = sandesha2_utils_get_soap_version(env, temp_envelope);
envelope = axiom_soap_envelope_create_default_soap_envelope(env, soap_version);
@@ -802,10 +802,10 @@
*/
axis2_status_t AXIS2_CALL
sandesha2_msg_creator_add_ack_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *app_msg,
- axis2_char_t *seq_id,
- sandesha2_storage_mgr_t *storage_mgr)
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *app_msg,
+ axis2_char_t *seq_id,
+ sandesha2_storage_mgr_t *storage_mgr)
{
axiom_soap_envelope_t *envelope = NULL;
axiom_soap_header_t *soap_header = NULL;
@@ -827,7 +827,7 @@
int i = 0, size = 0;
envelope = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(app_msg, env);
- if(NULL == envelope)
+ if(!envelope)
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_NULL_SOAP_ENVELOPE_IN_MSG_CTX, AXIS2_FAILURE);
@@ -836,7 +836,7 @@
msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(app_msg, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
rm_version = sandesha2_utils_get_rm_version(env, seq_id, storage_mgr);
- if(NULL == rm_version)
+ if(!rm_version)
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_CANNOT_FIND_RM_VERSION_OF_GIVEN_MSG,
@@ -875,7 +875,7 @@
/* sequence is closed. so add the 'Final' part. */
is_allowed = sandesha2_spec_specific_consts_is_ack_final_allowed(env,
rm_version);
- if(AXIS2_TRUE == is_allowed)
+ if(is_allowed)
{
sandesha2_ack_final_t *ack_final = NULL;
Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Mon Oct 30 23:55:32 2006
@@ -130,11 +130,10 @@
if(msg_ctx)
ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
prop = AXIS2_CTX_GET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
- if(NULL != prop)
+ if(prop)
addressing_ns = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(prop, env);
- if(addressing_ns == NULL && AXIS2_TRUE != AXIS2_MSG_CTX_GET_SERVER_SIDE(
- msg_ctx, env))
+ if(!addressing_ns && !AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
{
addressing_ns = AXIS2_STRDUP(AXIS2_WSA_NAMESPACE, env);
}
@@ -403,7 +402,7 @@
}
return AXIS2_TRUE;
}
-
+
static void add_op_if_null(
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
@@ -411,14 +410,10 @@
axis2_op_t *op = NULL;
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
- if(NULL == op)
+ if(!op)
{
axis2_svc_t *svc = NULL;
axis2_qname_t *tmp_qname = NULL;
- axis2_status_t status = AXIS2_FAILURE;
- axis2_conf_ctx_t *conf_ctx = NULL;
- axis2_conf_t *conf = NULL;
- axis2_phases_info_t *info = NULL;
tmp_qname = axis2_qname_create(env, "__OPERATION_OUT_IN__", NULL,
NULL);
@@ -428,29 +423,40 @@
AXIS2_FAILURE);
return;
}
- op = axis2_op_create_with_qname(env, tmp_qname);
- AXIS2_QNAME_FREE(tmp_qname, env);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
- info = AXIS2_CONF_GET_PHASES_INFO(conf, env);
- AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
- status = AXIS2_SVC_ADD_OP(svc, env, op);
- if(AXIS2_SUCCESS == status)
+ op = AXIS2_SVC_GET_OP_WITH_QNAME(svc, env, tmp_qname);
+ if(!op)
{
- status = AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
- if(AXIS2_SUCCESS != status)
+ axis2_status_t status = AXIS2_FAILURE;
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_conf_t *conf = NULL;
+ axis2_phases_info_t *info = NULL;
+
+ op = axis2_op_create_with_qname(env, tmp_qname);
+ AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ info = AXIS2_CONF_GET_PHASES_INFO(conf, env);
+ AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
+ status = AXIS2_SVC_ADD_OP(svc, env, op);
+ if(AXIS2_SUCCESS == status)
+ {
+ status = AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
+ if(AXIS2_SUCCESS != status)
+ {
+ AXIS2_OP_FREE(op, env);
+ op = NULL;
+ }
+ }
+ else
{
AXIS2_OP_FREE(op, env);
op = NULL;
}
}
- else
- {
- AXIS2_OP_FREE(op, env);
- op = NULL;
- }
- }
+ AXIS2_QNAME_FREE(tmp_qname, env);
+ AXIS2_MSG_CTX_SET_OP(msg_ctx, env, op);
+ }
}
+
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=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Mon Oct 30 23:55:32 2006
@@ -204,7 +204,7 @@
AXIS2_PARAM_CHECK(env->error, conf, NULL);
param = AXIS2_CONF_GET_PARAM(conf, env, SANDESHA2_SANDESHA_PROPERTY_BEAN);
- if(NULL == param)
+ if(!param)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CONFIGURATION_NOT_SET,
AXIS2_FAILURE);
@@ -341,9 +341,9 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_utils_start_invoker_for_seq(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id)
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id)
{
sandesha2_in_order_invoker_t *invoker = NULL;
axis2_property_t *property = NULL;
@@ -356,7 +356,7 @@
env, SANDESHA2_INVOKER, AXIS2_FALSE);
if(property)
invoker = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(NULL == invoker)
+ if(!invoker)
{
invoker = sandesha2_in_order_invoker_create(env);
property = axis2_property_create(env);
@@ -960,9 +960,9 @@
*/
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
sandesha2_utils_get_ack_range_list(
- const axis2_env_t *env,
- axis2_char_t *msg_no_str,
- axis2_char_t *rm_ns_value)
+ const axis2_env_t *env,
+ axis2_char_t *msg_no_str,
+ axis2_char_t *rm_ns_value)
{
axis2_array_list_t *ack_ranges = NULL;
axis2_array_list_t *sorted_msg_no_list = NULL;
@@ -975,7 +975,7 @@
sorted_msg_no_list = get_sorted_msg_no_list(env, msg_no_str, ",");
if(sorted_msg_no_list)
size = AXIS2_ARRAY_LIST_SIZE(sorted_msg_no_list, env);
- for(i = 0; i < size; i ++)
+ for(i = 0; i < size; i++)
{
long *temp = AXIS2_ARRAY_LIST_GET(sorted_msg_no_list, env, i);
if(lower == 0)
@@ -993,7 +993,6 @@
{
sandesha2_ack_range_t *ack_range = NULL;
- /* add ack_range (lower, upper) */
ack_range = sandesha2_ack_range_create(env, rm_ns_value, NULL);
SANDESHA2_ACK_RANGE_SET_LOWER_VALUE(ack_range, env, lower);
SANDESHA2_ACK_RANGE_SET_UPPER_VALUE(ack_range, env, upper);
@@ -1003,7 +1002,7 @@
completed = AXIS2_FALSE;
}
}
- if(AXIS2_TRUE != completed)
+ if(!completed)
{
sandesha2_ack_range_t *ack_range = NULL;
@@ -1011,7 +1010,7 @@
SANDESHA2_ACK_RANGE_SET_LOWER_VALUE(ack_range, env, lower);
SANDESHA2_ACK_RANGE_SET_UPPER_VALUE(ack_range, env, upper);
AXIS2_ARRAY_LIST_ADD(ack_ranges, env, ack_range);
- completed = AXIS2_FALSE;
+ completed = AXIS2_TRUE;
}
/*AXIS2_ARRAY_LIST_FREE(sorted_msg_no_list, env);*/
return ack_ranges;
@@ -1025,11 +1024,13 @@
{
axis2_array_list_t *msg_numbers = NULL;
axis2_array_list_t *sorted_msg_no_list = NULL;
+ axis2_char_t *dup_str = NULL;
axis2_char_t *temp_str = NULL;
+ dup_str = AXIS2_STRDUP(msg_no_str, env);
msg_numbers = axis2_array_list_create(env, 0);
- temp_str = strtok(msg_no_str, delim);
- while(NULL != temp_str)
+ temp_str = strtok(dup_str, delim);
+ while(temp_str)
{
long *long_val = AXIS2_MALLOC(env->allocator, sizeof(long));
@@ -1039,6 +1040,7 @@
}
sorted_msg_no_list = sandesha2_utils_sort(env, msg_numbers);
/*AXIS2_ARRAY_LIST_FREE(msg_numbers, env);*/
+ AXIS2_FREE(env->allocator, dup_str);
return sorted_msg_no_list;
}
@@ -1079,7 +1081,7 @@
break;
}
}
- if(AXIS2_TRUE == contains)
+ if(contains)
{
AXIS2_ARRAY_LIST_ADD(sorted_list, env, temp);
}
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Mon Oct 30 23:55:32 2006
@@ -380,7 +380,6 @@
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_endpoint_ref_t *reply_to_epr = NULL;
- axis2_property_t *property = NULL;
axis2_msg_ctx_t *req_msg_ctx = NULL;
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(first_app_msg, env);
Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Mon Oct 30 23:55:32 2006
@@ -240,10 +240,11 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_run_invoker_for_seq
- (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id)
+sandesha2_in_order_invoker_run_invoker_for_seq (
+ sandesha2_in_order_invoker_t *invoker,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id)
{
sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -251,10 +252,10 @@
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- if(AXIS2_FALSE == sandesha2_utils_array_list_contains(env,
+ if(!sandesha2_utils_array_list_contains(env,
invoker_impl->working_seqs, seq_id))
AXIS2_ARRAY_LIST_ADD(invoker_impl->working_seqs, env, seq_id);
- if(AXIS2_FALSE == invoker_impl->run_invoker)
+ if(!invoker_impl->run_invoker)
{
invoker_impl->conf_ctx = conf_ctx;
invoker_impl->run_invoker = AXIS2_TRUE;
@@ -264,8 +265,9 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_run (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env)
+sandesha2_in_order_invoker_run (
+ sandesha2_in_order_invoker_t *invoker,
+ const axis2_env_t *env)
{
sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
axis2_thread_t *worker_thread = NULL;
@@ -293,8 +295,9 @@
axis2_status_t AXIS2_CALL
sandesha2_in_order_invoker_make_msg_ready_for_reinjection(
- sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx)
+ sandesha2_in_order_invoker_t *invoker,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
{
axis2_property_t *property = NULL;
@@ -319,7 +322,9 @@
* Thread worker function.
*/
void * AXIS2_THREAD_FUNC
-sandesha2_in_order_invoker_worker_func(axis2_thread_t *thd, void *data)
+sandesha2_in_order_invoker_worker_func(
+ axis2_thread_t *thd,
+ void *data)
{
sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
sandesha2_in_order_invoker_t *invoker = NULL;
@@ -331,7 +336,7 @@
invoker_impl = args->impl;
invoker = (sandesha2_in_order_invoker_t*)invoker_impl;
- while(AXIS2_TRUE == invoker_impl->run_invoker)
+ while(invoker_impl->run_invoker)
{
sandesha2_transaction_t *transaction = NULL;
/* Use when transaction handling is done
@@ -359,11 +364,11 @@
all_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
env, SANDESHA2_SEQ_PROP_ALL_SEQS,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
- if(NULL == all_seq_bean)
+ if(!all_seq_bean)
continue;
all_seq_list = sandesha2_utils_get_array_list_from_string(env,
SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(all_seq_bean, env));
- if(NULL == all_seq_list)
+ if(!all_seq_list)
continue;
for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(all_seq_list, env); i++)
@@ -383,7 +388,7 @@
storage_mgr, env);
next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(
next_msg_mgr, env, seq_id);
- if(NULL == next_msg_bean)
+ if(!next_msg_bean)
{
axis2_char_t *str_list = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Next message not set"
@@ -430,8 +435,10 @@
env);
msg_to_invoke = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(
storage_mgr, env, key, invoker_impl->conf_ctx);
- rm_msg_ctx = sandesha2_msg_init_init_msg(env,
+ if(msg_to_invoke)
+ rm_msg_ctx = sandesha2_msg_init_init_msg(env,
msg_to_invoke);
+ else continue;
/* have to commit the transaction before invoking. This may get
* changed when WS-AT is available.
*/
@@ -440,14 +447,14 @@
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
SANDESHA2_VALUE_TRUE, env));
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_to_invoke, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = AXIS2_MSG_CTX_GET_PROPERTY(msg_to_invoke, env,
SANDESHA2_POST_FAILURE_MESSAGE, AXIS2_FALSE);
- if(NULL != property)
+ if(property)
post_failure_str = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(NULL != post_failure_str && 0 == AXIS2_STRCMP(
+ if(post_failure_str && 0 == AXIS2_STRCMP(
post_failure_str, SANDESHA2_VALUE_TRUE))
post_failure_invocation = AXIS2_TRUE;
engine = axis2_engine_create(env, invoker_impl->conf_ctx);
@@ -458,14 +465,17 @@
AXIS2_ENGINE_RECEIVE(engine, env, msg_to_invoke);
}
else
+ {
+ AXIS2_MSG_CTX_SET_PAUSED(msg_to_invoke, env, AXIS2_FALSE);
AXIS2_ENGINE_RESUME_RECEIVE(engine, env, msg_to_invoke);
+ }
invoked = AXIS2_TRUE;
transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(
storage_mgr, env);
SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env, key);
msg_ctx = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(
storage_mgr, env, key, invoker_impl->conf_ctx);
- if(NULL != msg_ctx)
+ if(msg_ctx)
SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr,
env, key);
if(SANDESHA2_MSG_TYPE_APPLICATION ==
@@ -474,7 +484,7 @@
sandesha2_seq_t *seq = NULL;
seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
- if(NULL != SANDESHA2_SEQ_GET_LAST_MSG(seq, env))
+ if(SANDESHA2_SEQ_GET_LAST_MSG(seq, env))
{
sandesha2_terminate_mgr_clean_recv_side_after_invocation(
env, invoker_impl->conf_ctx, seq_id,
@@ -485,9 +495,11 @@
}
}
}
- if(AXIS2_FALSE == continue_seq)
+ if(!continue_seq)
+ {
break;
- if(AXIS2_TRUE == invoked)
+ }
+ if(invoked)
{
next_msg_no++;
SANDESHA2_NEXT_MSG_BEAN_SET_NEXT_MSG_NO_TO_PROCESS(next_msg_bean,
@@ -502,3 +514,4 @@
}
return NULL;
}
+
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Mon Oct 30 23:55:32 2006
@@ -497,7 +497,7 @@
seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
storage_mgr, env);
sender_bean = SANDESHA2_SENDER_MGR_GET_NEXT_MSG_TO_SEND(mgr, env);
- if(NULL == sender_bean)
+ if(!sender_bean)
{
continue;
}
@@ -505,7 +505,7 @@
key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(sender_bean, env);
msg_ctx = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_mgr, env, key,
sender_impl->conf_ctx);
- if(NULL == msg_ctx)
+ if(!msg_ctx)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] msg_ctx is "
"not present in the store");
@@ -519,27 +519,27 @@
property, AXIS2_FALSE);
continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env,
sender_bean, sender_impl->conf_ctx, storage_mgr);
- if(AXIS2_FALSE == continue_sending)
+ if(!continue_sending)
{
continue;
}
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, AXIS2_FALSE);
- if(NULL != property)
+ if(property)
qualified_for_sending = AXIS2_PROPERTY_GET_VALUE(property, env);
- if(NULL != qualified_for_sending && 0 != AXIS2_STRCMP(
+ if(qualified_for_sending && 0 != AXIS2_STRCMP(
qualified_for_sending, SANDESHA2_VALUE_TRUE))
continue;
rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);
prop_bean = sandesha2_utils_get_property_bean_from_op(env,
AXIS2_MSG_CTX_GET_OP(msg_ctx, env));
- if(NULL != prop_bean)
+ if(prop_bean)
msgs_not_to_send = SANDESHA2_PROPERTY_BEAN_GET_MSG_TYPES_TO_DROP(
prop_bean, env);
- if(NULL != msgs_not_to_send)
+ if(msgs_not_to_send)
{
int j = 0;
axis2_bool_t continue_sending = AXIS2_FALSE;
@@ -556,7 +556,7 @@
if(msg_type == int_val)
continue_sending = AXIS2_TRUE;
}
- if(AXIS2_TRUE == continue_sending)
+ if(continue_sending)
continue;
}
/*
@@ -577,7 +577,7 @@
seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(identifier, env);
}
- if(AXIS2_TRUE == sandesha2_sender_is_piggybackable_msg_type(sender, env,
+ if(sandesha2_sender_is_piggybackable_msg_type(sender, env,
msg_type) && AXIS2_FALSE ==
sandesha2_sender_is_ack_already_piggybacked(sender, env,
rm_msg_ctx))
@@ -590,7 +590,7 @@
transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out,
env);
- if(NULL != transport_sender)
+ if(transport_sender)
{
SANDESHA2_TRANSACTION_COMMIT(transaction, env);
property = axis2_property_create(env);
@@ -600,12 +600,11 @@
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
/* Consider building soap envelope */
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(msg_ctx, env, AXIS2_FALSE);*/
AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
successfully_sent = AXIS2_TRUE;
- sender_impl->counter++;
- /*printf("**********************counter******************:%d\n", sender_impl->counter);
- if(2 == sender_impl->counter)
+ sender_impl->counter++;
+ /*printf("**********************counter******************:%d\n", sender_impl->counter);
+ if(2 == sender_impl->counter)
sleep(300000);*/
}
@@ -619,7 +618,7 @@
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
msg_id = SANDESHA2_SENDER_BEAN_GET_MSG_ID(sender_bean, env);
bean1 = SANDESHA2_SENDER_MGR_RETRIEVE(mgr, env, msg_id);
- if(NULL != bean1)
+ if(bean1)
{
axis2_bool_t resend = AXIS2_FALSE;
@@ -645,7 +644,7 @@
msg_stored_key);
}
}
- if(AXIS2_TRUE == successfully_sent)
+ if(successfully_sent)
{
if(AXIS2_FALSE == AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
sandesha2_sender_check_for_sync_res(sender, env, msg_ctx);
Modified: webservices/sandesha/trunk/c/src/wsrm/sequence.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/sequence.c?view=diff&rev=469402&r1=469401&r2=469402
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Mon Oct 30 23:55:32 2006
@@ -200,16 +200,17 @@
void *seq,
const axis2_env_t *env)
{
- sandesha2_seq_t *seq_l = NULL;
+ sandesha2_iom_rm_element_t *seq_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- seq_l = (sandesha2_seq_t *) seq;
+ seq_l = (sandesha2_iom_rm_element_t *) seq;
return sandesha2_seq_free(seq_l, env);
}
axis2_status_t AXIS2_CALL
-sandesha2_seq_free (sandesha2_iom_rm_element_t *seq,
- const axis2_env_t *env)
+sandesha2_seq_free (
+ sandesha2_iom_rm_element_t *seq,
+ const axis2_env_t *env)
{
sandesha2_seq_impl_t *seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org