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 2006/09/05 11:49:59 UTC
svn commit: r440308 - in /webservices/sandesha/trunk/c/src: core/ handlers/
msgprocessors/ storage/inmemory/ transport/ util/
Author: damitha
Date: Tue Sep 5 02:49:58 2006
New Revision: 440308
URL: http://svn.apache.org/viewvc?view=rev&rev=440308
Log:
more bug fixes
Modified:
webservices/sandesha/trunk/c/src/core/msg_ctx.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/util/utils.c
Modified: webservices/sandesha/trunk/c/src/core/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/msg_ctx.c?view=diff&rev=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/core/msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/msg_ctx.c Tue Sep 5 02:49:58 2006
@@ -116,8 +116,10 @@
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-sandesha2_msg_ctx_set_msg_id(sandesha2_msg_ctx_t *rm_msg_ctx,
- const axis2_env_t *env, axis2_char_t *msg_id);
+sandesha2_msg_ctx_set_msg_id(
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ const axis2_env_t *env,
+ axis2_char_t *msg_id);
axiom_soap_envelope_t *AXIS2_CALL
sandesha2_msg_ctx_get_soap_envelope(sandesha2_msg_ctx_t *rm_msg_ctx,
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?view=diff&rev=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Tue Sep 5 02:49:58 2006
@@ -69,9 +69,9 @@
axis2_status_t AXIS2_CALL
sandesha2_in_handler_invoke(
- struct axis2_handler *handler,
- const axis2_env_t *env,
- struct axis2_msg_ctx *msg_ctx)
+ struct axis2_handler *handler,
+ const axis2_env_t *env,
+ struct axis2_msg_ctx *msg_ctx)
{
axis2_property_t *temp_prop = NULL;
axis2_property_t *property = NULL;
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=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Sep 5 02:49:58 2006
@@ -61,75 +61,75 @@
/***************************** Function headers *******************************/
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);
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *msg_ctx);
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);
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *msg_ctx);
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);
+ 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);
+ 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
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);
+ 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
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,
- long msg_num,
- axis2_char_t *storage_key,
- sandesha2_storage_mgr_t *mgr);
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *msg_ctx,
+ axis2_char_t *internal_seq_id,
+ long msg_num,
+ axis2_char_t *storage_key,
+ sandesha2_storage_mgr_t *mgr);
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);
+ 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
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);
+ 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
sandesha2_app_msg_processor_free (
- sandesha2_msg_processor_t *element,
- const axis2_env_t *env);
+ sandesha2_msg_processor_t *element,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_msg_processor_t* AXIS2_CALL
sandesha2_app_msg_processor_create(
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
sandesha2_app_msg_processor_impl_t *msg_proc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -166,8 +166,8 @@
axis2_status_t AXIS2_CALL
sandesha2_app_msg_processor_free (
- sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env)
{
sandesha2_app_msg_processor_impl_t *msg_proc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -183,13 +183,13 @@
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)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx)
{
sandesha2_seq_ack_t *seq_ack = NULL;
sandesha2_ack_requested_t *ack_requested = NULL;
- axis2_msg_ctx_t *msg_ctx1 = NULL;
+ axis2_msg_ctx_t *msg_ctx = NULL;
axis2_char_t *processed = NULL;
axis2_op_ctx_t *op_ctx = NULL;
axis2_ctx_t *ctx = NULL;
@@ -216,34 +216,34 @@
axis2_char_t *highest_in_msg_key_str = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(msg_ctx,
+ 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)
{
sandesha2_msg_processor_t *ack_proc = NULL;
ack_proc = sandesha2_ack_msg_processor_create(env);
- SANDESHA2_MSG_PROCESSOR_PROCESS_IN_MSG(ack_proc, env, msg_ctx);
+ SANDESHA2_MSG_PROCESSOR_PROCESS_IN_MSG(ack_proc, env, rm_msg_ctx);
}
ack_requested = (sandesha2_ack_requested_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
- msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
+ rm_msg_ctx, env, SANDESHA2_MSG_PART_ACK_REQUEST);
if(NULL != ack_requested)
{
SANDESHA2_ACK_REQUESTED_SET_MUST_UNDERSTAND(ack_requested, env,
AXIS2_FALSE);
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(msg_ctx, env);
+ SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
}
- msg_ctx1 = SANDESHA2_MSG_CTX_GET_MSG_CTX(msg_ctx, env);
- if(NULL == msg_ctx1)
+ msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
+ if(NULL == msg_ctx)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- property = SANDESHA2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = SANDESHA2_MSG_CTX_GET_PROPERTY(rm_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE);
if(NULL != property)
@@ -255,7 +255,7 @@
return AXIS2_SUCCESS;
}
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx1, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if (NULL != op_ctx)
{
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
@@ -271,12 +271,12 @@
property, AXIS2_FALSE);
}
}
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx1, env);
+ conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
fault_man = sandesha2_fault_mgr_create(env);
fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_LAST_MSG_NUM_EXCEEDED(
- fault_man, env, msg_ctx, storage_man);
+ fault_man, env, rm_msg_ctx, storage_man);
if(NULL != fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -287,18 +287,18 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx1, env, AXIS2_TRUE);
+ AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
storage_man, env);
- seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(msg_ctx, env,
+ seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
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,
- msg_ctx, str_seq_id, storage_man);
+ rm_msg_ctx, str_seq_id, storage_man);
if(NULL != fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -309,13 +309,13 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx1, env, AXIS2_TRUE);
+ AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
SANDESHA2_SEQ_SET_MUST_UNDERSTAND(seq, env, AXIS2_FALSE);
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(msg_ctx, env);
+ SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
fault_ctx = SANDESHA2_FAULT_MGR_CHECK_FOR_SEQ_CLOSED(fault_man, env,
- msg_ctx, str_seq_id, storage_man);
+ rm_msg_ctx, str_seq_id, storage_man);
if(NULL != fault_ctx)
{
axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
@@ -326,7 +326,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx1, env, AXIS2_TRUE);
+ AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
sandesha2_seq_mgr_update_last_activated_time(env, str_seq_id,
@@ -372,7 +372,7 @@
SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_man, env,
highest_in_msg_key_str);
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env,
- highest_in_msg_key_str, msg_ctx1);
+ highest_in_msg_key_str, msg_ctx);
if(NULL != highest_in_msg_no_str)
{
SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
@@ -404,7 +404,7 @@
0 == AXIS2_STRCMP(SANDESHA2_QOS_DEFAULT_INVOCATION_TYPE,
SANDESHA2_QOS_EXACTLY_ONCE))
{
- SANDESHA2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
}
if(NULL != msgs_str && 0 < AXIS2_STRLEN(msgs_str))
msgs_str = axis2_strcat(env, msgs_str, ",", msg_num_str, NULL);
@@ -485,7 +485,7 @@
}
/* save the message */
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, str_key,
- msg_ctx1);
+ msg_ctx);
invoker_bean = sandesha2_invoker_bean_create_with_data(env, str_key,
msg_no, str_seq_id, AXIS2_FALSE);
SANDESHA2_INVOKER_MGR_INSERT(storage_map_mgr, env, invoker_bean);
@@ -494,13 +494,13 @@
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
SANDESHA2_VALUE_TRUE, env));
/* To avoid performing application processing more than once. */
- SANDESHA2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
+ SANDESHA2_MSG_CTX_SET_PROPERTY(rm_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
- SANDESHA2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
+ SANDESHA2_MSG_CTX_SET_PAUSED(rm_msg_ctx, env, AXIS2_TRUE);
/* 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, msg_ctx,
+ sandesha2_app_msg_processor_send_ack_if_reqd(msg_processor, env, rm_msg_ctx,
msgs_str, storage_man);
return AXIS2_SUCCESS;
@@ -508,11 +508,11 @@
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)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx)
{
- axis2_msg_ctx_t *msg_ctx1 = NULL;
+ axis2_msg_ctx_t *msg_ctx = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_storage_mgr_t *storage_man = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
@@ -538,19 +538,19 @@
axis2_char_t *to_addr = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- msg_ctx1 = SANDESHA2_MSG_CTX_GET_MSG_CTX(msg_ctx, env);
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx1, env);
+ 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 */
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
storage_man, env);
- is_svr_side = AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx1, env);
+ is_svr_side = AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env);
- to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx1, env);
+ to_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
if(NULL == to_epr || NULL == AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env)
|| 0 == AXIS2_STRLEN(AXIS2_ENDPOINT_REF_GET_ADDRESS(
to_epr, env)))
@@ -560,8 +560,8 @@
return AXIS2_FAILURE;
}
- if(NULL == AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx1, env))
- AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx1, env, axis2_uuid_gen(env));
+ if(NULL == AXIS2_MSG_CTX_GET_MSG_ID(msg_ctx, env))
+ AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, axis2_uuid_gen(env));
storage_key = axis2_uuid_gen(env);
if(AXIS2_TRUE == is_svr_side)
@@ -576,7 +576,7 @@
axis2_ctx_t *ctx = NULL;
axis2_property_t *property = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx1, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
/*req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env,
AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
@@ -623,13 +623,13 @@
axis2_char_t *last_app_msg = NULL;
to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx1, env,
+ property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_SEQ_KEY, AXIS2_FALSE);
if(NULL != property)
seq_key = AXIS2_PROPERTY_GET_VALUE(property, env);
internal_seq_id = sandesha2_utils_get_internal_seq_id(env,
to, seq_key);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx1, env,
+ property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_LAST_MESSAGE, AXIS2_FALSE);
if(NULL != property)
last_app_msg = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -637,7 +637,7 @@
SANDESHA2_VALUE_TRUE))
last_msg = AXIS2_TRUE;
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx1, env,
+ property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_MESSAGE_NUMBER, AXIS2_FALSE);
if(NULL != property)
{
@@ -668,7 +668,7 @@
/* A dummy message is a one which will not be processed as a actual
* application message. The RM handlers will simply let these go.
*/
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx1, env,
+ property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_DUMMY_MESSAGE, AXIS2_FALSE);
if(NULL != property)
dummy_msg_str = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -734,18 +734,18 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, incoming_to);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx1, env, SANDESHA2_SEQ_PROP_TO_EPR,
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_SEQ_PROP_TO_EPR,
property, AXIS2_FALSE);
}
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx1, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(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);
seq = (sandesha2_seq_t *) AXIS2_PROPERTY_GET_VALUE(property,
env);
- /*req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx1,
+ /*req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx,
env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
if(NULL == req_msg_ctx)
{
@@ -771,7 +771,7 @@
}
else
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx1, env,
+ property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_RM_SPEC_VERSION, AXIS2_FALSE);
if(NULL != property)
spec_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -782,7 +782,7 @@
{
if(NULL == out_seq_bean)
send_create_seq = AXIS2_TRUE;
- sandesha2_seq_mgr_setup_new_client_seq(env, msg_ctx1,
+ sandesha2_seq_mgr_setup_new_client_seq(env, msg_ctx,
internal_seq_id, spec_ver, storage_man);
}
if(AXIS2_TRUE == send_create_seq)
@@ -808,18 +808,29 @@
SANDESHA2_VALUE_TRUE);
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
res_create_seq_added);
- if(NULL != AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx1, env))
+ if(NULL != AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env))
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx1, env,
+ property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_ACKS_TO, AXIS2_FALSE);
if(NULL != property)
acks_to = AXIS2_PROPERTY_GET_VALUE(property, env);
}
if(AXIS2_TRUE == is_svr_side)
{
+ axis2_op_ctx_t *op_ctx = NULL;
+ axis2_ctx_t *ctx = NULL;
+ axis2_property_t *property = NULL;
+ axis2_endpoint_ref_t *acks_to_epr = NULL;
+
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
+ property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ SANDESHA2_SEQ_PROP_REPLY_TO_EPR,AXIS2_FALSE);
+ acks_to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);
+ acks_to = AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to_epr, env);
/*axis2_msg_ctx_t *req_msg_ctx = NULL;
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(
- msg_ctx1, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
+ msg_ctx, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
if(NULL == req_msg_ctx)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Request message is"
@@ -827,9 +838,9 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_MSG_CTX,
AXIS2_FAILURE);
return AXIS2_FAILURE;
- }*/
+ }
acks_to = AXIS2_ENDPOINT_REF_GET_ADDRESS(AXIS2_MSG_CTX_GET_TO(
- msg_ctx1, env), env);
+ req_msg_ctx, env), env);*/
}
else if(NULL == acks_to)
acks_to = anon_uri;
@@ -859,19 +870,19 @@
* TODO handle acks_to == anon_uri case
*/
sandesha2_app_msg_processor_add_create_seq_msg(msg_processor, env,
- msg_ctx, internal_seq_id, acks_to, storage_man);
+ rm_msg_ctx, internal_seq_id, acks_to, storage_man);
}
}
- soap_env = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
+ soap_env = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env);
if(NULL == soap_env)
{
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
AXIOM_SOAP12);
- SANDESHA2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_env);
+ SANDESHA2_MSG_CTX_SET_SOAP_ENVELOPE(rm_msg_ctx, env, soap_env);
}
msg_id = axis2_uuid_gen(env);
- if(NULL == SANDESHA2_MSG_CTX_GET_MSG_ID(msg_ctx, env))
- SANDESHA2_MSG_CTX_SET_MSG_ID(msg_ctx, env, msg_id);
+ if(NULL == SANDESHA2_MSG_CTX_GET_MSG_ID(rm_msg_ctx, env))
+ SANDESHA2_MSG_CTX_SET_MSG_ID(rm_msg_ctx, env, msg_id);
if(AXIS2_TRUE == is_svr_side)
{
@@ -883,9 +894,9 @@
axis2_ctx_t *ctx = NULL;
axis2_char_t *written = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx1, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
/*req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(
- msg_ctx1, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
+ msg_ctx, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
if(NULL == req_msg_ctx)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Request message is"
@@ -905,7 +916,7 @@
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_ctx_t *ctx = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx1, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if (NULL != op_ctx)
{
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
@@ -922,30 +933,30 @@
}
}
op_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(AXIS2_OP_CTX_GET_OP(
- AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx1, env), env), env),
+ AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env), env),
env);
to_addr = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
- if(NULL == AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx1, env))
- AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx1, env, axis2_strcat(env, to_addr,
+ if(NULL == AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
+ AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, axis2_strcat(env, to_addr,
"/", op_name, NULL));
- if(NULL == AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx1, env))
- AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx1, env, axis2_strcat(env, "\"",
+ if(NULL == AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env))
+ AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, axis2_strcat(env, "\"",
to_addr, "/", op_name, "\"", NULL));
if(AXIS2_FALSE == dummy_msg)
sandesha2_app_msg_processor_process_response_msg(msg_processor, env,
- msg_ctx, internal_seq_id, msg_number, storage_key,
+ rm_msg_ctx, internal_seq_id, msg_number, storage_key,
storage_man);
- AXIS2_MSG_CTX_SET_PAUSED(msg_ctx1, env, AXIS2_TRUE);
+ AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
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)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ axis2_char_t *list,
+ long num)
{
axis2_char_t str_long[32];
@@ -962,11 +973,11 @@
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,
- sandesha2_storage_mgr_t *mgr)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ axis2_char_t *msg_str,
+ sandesha2_storage_mgr_t *mgr)
{
sandesha2_seq_t *seq = NULL;
axis2_char_t *seq_id = NULL;
@@ -1014,14 +1025,14 @@
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)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ axis2_char_t *internal_seq_id,
+ axis2_char_t *acks_to,
+ sandesha2_storage_mgr_t *mgr)
{
- axis2_msg_ctx_t *msg_ctx1 = NULL;
+ axis2_msg_ctx_t *msg_ctx = NULL;
sandesha2_create_seq_t *create_seq_part = NULL;
sandesha2_msg_ctx_t *create_seq_rm_msg = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
@@ -1042,14 +1053,14 @@
axis2_char_t *msg_id = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, acks_to, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- msg_ctx1 = SANDESHA2_MSG_CTX_GET_MSG_CTX(msg_ctx, env);
+ msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
create_seq_rm_msg = sandesha2_msg_creator_create_create_seq_msg(env,
- msg_ctx, internal_seq_id, acks_to, mgr);
+ rm_msg_ctx, internal_seq_id, acks_to, mgr);
SANDESHA2_MSG_CTX_SET_FLOW(create_seq_rm_msg, env,
SANDESHA2_MSG_CTX_OUT_FLOW);
@@ -1155,15 +1166,15 @@
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,
- long msg_num,
- axis2_char_t *storage_key,
- sandesha2_storage_mgr_t *mgr)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ axis2_char_t *internal_seq_id,
+ long msg_num,
+ axis2_char_t *storage_key,
+ sandesha2_storage_mgr_t *mgr)
{
- axis2_msg_ctx_t *msg = NULL;
+ axis2_msg_ctx_t *app_msg_ctx = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_sender_mgr_t *retransmitter_man = NULL;
sandesha2_seq_property_bean_t *to_bean = NULL;
@@ -1187,13 +1198,14 @@
axis2_engine_t *engine = NULL;
sandesha2_identifier_t *identifier = NULL;
axis2_char_t *msg_id = NULL;
+ axis2_bool_t last_msg = AXIS2_FALSE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_key, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mgr, AXIS2_FAILURE);
- msg = SANDESHA2_MSG_CTX_GET_MSG_CTX(msg_ctx, env);
+ app_msg_ctx = SANDESHA2_MSG_CTX_GET_MSG_CTX(rm_msg_ctx, env);
seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(
mgr, env);
@@ -1218,25 +1230,25 @@
SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(reply_to_bean,
env));
- if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(msg, env))
+ if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(app_msg_ctx, env))
{
axis2_endpoint_ref_t *reply_to = NULL;
- /*req_msg = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(msg, 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_REPLY_TO(msg, env);
+ reply_to = AXIS2_MSG_CTX_GET_TO(app_msg_ctx, env);
if(reply_to)
new_to_str = AXIS2_ENDPOINT_REF_GET_ADDRESS(reply_to, env);
}
if(NULL != new_to_str)
- SANDESHA2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env,
+ SANDESHA2_MSG_CTX_SET_TO(rm_msg_ctx, env, axis2_endpoint_ref_create(env,
new_to_str));
else
- SANDESHA2_MSG_CTX_SET_TO(msg_ctx, env, to_epr);
+ SANDESHA2_MSG_CTX_SET_TO(rm_msg_ctx, env, to_epr);
if(NULL != reply_to_epr)
- SANDESHA2_MSG_CTX_SET_REPLY_TO(msg_ctx, env, reply_to_epr);
+ SANDESHA2_MSG_CTX_SET_REPLY_TO(rm_msg_ctx, env, reply_to_epr);
rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, mgr);
if(NULL == rm_version)
@@ -1251,7 +1263,7 @@
SANDESHA2_MSG_NUMBER_SET_MSG_NUM(msg_number, env, msg_num);
SANDESHA2_SEQ_SET_MSG_NUM(seq, env, msg_number);
- if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(msg, env))
+ 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;
@@ -1259,7 +1271,7 @@
/*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(msg, env);
+ 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);
@@ -1273,6 +1285,7 @@
}
if(NULL != SANDESHA2_SEQ_GET_LAST_MSG(req_seq, env))
{
+ last_msg = AXIS2_TRUE;
SANDESHA2_SEQ_SET_LAST_MSG(seq, env,
sandesha2_last_msg_create(env, rm_ns_val));
}
@@ -1283,7 +1296,7 @@
axis2_property_t *property = NULL;
axis2_ctx_t *ctx = NULL;
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg, env);
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(app_msg_ctx, env);
if(NULL != op_ctx)
{
ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
@@ -1298,14 +1311,14 @@
axis2_char_t *spec_ver = NULL;
spec_ver = sandesha2_utils_get_rm_version(env,
internal_seq_id, mgr);
- /* uncomment if we need following ?*/
- /*if(AXIS2_TRUE ==
+ last_msg = AXIS2_TRUE;
+ if(AXIS2_TRUE ==
sandesha2_spec_specific_consts_is_last_msg_indicator_reqd
(env, spec_ver))
{
SANDESHA2_SEQ_SET_LAST_MSG(seq, env,
sandesha2_last_msg_create(env, rm_ns_val));
- }*/
+ }
}
}
}
@@ -1319,16 +1332,16 @@
identifier = sandesha2_identifier_create(env, rm_ns_val);
SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, str_identifier);
SANDESHA2_SEQ_SET_IDENTIFIER(seq, env, identifier);
- SANDESHA2_MSG_CTX_SET_MSG_PART(msg_ctx, env, SANDESHA2_MSG_PART_SEQ,
+ SANDESHA2_MSG_CTX_SET_MSG_PART(rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ,
(sandesha2_iom_rm_part_t*)seq);
/* TODO add_ack_requested */
- SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(msg_ctx, env);
+ SANDESHA2_MSG_CTX_ADD_SOAP_ENVELOPE(rm_msg_ctx, env);
app_msg_entry = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(app_msg_entry, env,
storage_key);
millisecs = sandesha2_utils_get_current_time_in_millis(env);
SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(app_msg_entry, env, millisecs);
- msg_id = SANDESHA2_MSG_CTX_GET_MSG_ID(msg_ctx, env);
+ msg_id = SANDESHA2_MSG_CTX_GET_MSG_ID(rm_msg_ctx, env);
SANDESHA2_SENDER_BEAN_SET_MSG_ID(app_msg_entry, env, msg_id);
SANDESHA2_SENDER_BEAN_SET_MSG_NO(app_msg_entry, env, msg_num);
SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(app_msg_entry, env,
@@ -1347,17 +1360,17 @@
SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
}
SANDESHA2_SENDER_BEAN_SET_INTERNAL_SEQ_ID(app_msg_entry, env, internal_seq_id);
- SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, storage_key, msg);
+ SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(mgr, env, storage_key, app_msg_ctx);
SANDESHA2_SENDER_MGR_INSERT(retransmitter_man, env, app_msg_entry);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(
SANDESHA2_VALUE_FALSE, env));
- AXIS2_MSG_CTX_SET_PROPERTY(msg, env,
+ AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property, AXIS2_FALSE);
trs_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(
- AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg, env), env);
+ AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(app_msg_ctx, env), env);
if(NULL != trs_sender)
{
axis2_transport_out_desc_t *trans_out = NULL;
@@ -1365,34 +1378,34 @@
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(storage_key, env));
- AXIS2_MSG_CTX_SET_PROPERTY(msg, env,
+ AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg, env);
+ trans_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(app_msg_ctx, env);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
trans_out->ops->free_void_arg);
AXIS2_PROPERTY_SET_VALUE(property, env, trans_out);
- AXIS2_MSG_CTX_SET_PROPERTY(msg, env,
+ AXIS2_MSG_CTX_SET_PROPERTY(app_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property,
AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg, env,
+ AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(app_msg_ctx, env,
sandesha2_utils_get_transport_out(env));
}
- AXIS2_MSG_CTX_SET_CURRENT_HANDLER_INDEX(msg, env,
- AXIS2_MSG_CTX_GET_CURRENT_HANDLER_INDEX(msg, env) + 1);
- engine = axis2_engine_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(msg, env));
- return AXIS2_ENGINE_RESUME_SEND(engine, env, msg);
+ 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));
+ return AXIS2_ENGINE_RESUME_SEND(engine, env, app_msg_ctx);
}
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)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ axis2_char_t *internal_seq_id,
+ sandesha2_storage_mgr_t *mgr)
{
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *next_msg_no_bean = NULL;
@@ -1423,11 +1436,11 @@
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)
+ 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)
{
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *next_msg_no_bean = NULL;
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=440308&r1=440307&r2=440308
==============================================================================
--- 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 Tue Sep 5 02:49:58 2006
@@ -68,32 +68,34 @@
/***************************** Function headers *******************************/
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);
-
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
+
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);
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
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);
-
+ 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_res_msg_processor_free (sandesha2_msg_processor_t *element,
- const axis2_env_t *env);
+sandesha2_create_seq_res_msg_processor_free (
+ sandesha2_msg_processor_t *element,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_msg_processor_t* AXIS2_CALL
-sandesha2_create_seq_res_msg_processor_create(const axis2_env_t *env)
+sandesha2_create_seq_res_msg_processor_create(
+ const axis2_env_t *env)
{
sandesha2_create_seq_res_msg_processor_impl_t *msg_proc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -130,8 +132,9 @@
axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_msg_processor_free (sandesha2_msg_processor_t *msg_processor,
- const axis2_env_t *env)
+sandesha2_create_seq_res_msg_processor_free (
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_env_t *env)
{
sandesha2_create_seq_res_msg_processor_impl_t *msg_proc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -147,9 +150,9 @@
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)
+ 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;
axis2_conf_ctx_t *conf_ctx = NULL;
@@ -344,7 +347,8 @@
found_list = SANDESHA2_SENDER_MGR_FIND_BY_SENDER_BEAN(retrans_mgr, env,
target_bean);
- size = AXIS2_ARRAY_LIST_SIZE(found_list, env);
+ if(found_list)
+ size = AXIS2_ARRAY_LIST_SIZE(found_list, env);
for(i = 0; i < size; i++)
{
sandesha2_sender_bean_t *tmp_bean = NULL;
@@ -417,9 +421,9 @@
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)
+ sandesha2_msg_processor_t *msg_processor,
+ const axis2_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=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Tue Sep 5 02:49:58 2006
@@ -537,7 +537,7 @@
key = axis2_uuid_gen(env);
term_bean = sandesha2_sender_bean_create(env);
- SANDESHA2_SENDER_BEAN_SET_MSG_CTX_REF_KEY(term_bean, env, key);
+ SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(term_bean, env, key);
SANDESHA2_STORAGE_MGR_STORE_MSG_CTX(storage_man, env, key, msg_ctx);
/* TODO: refine the terminate delay */
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c?view=diff&rev=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c Tue Sep 5 02:49:58 2006
@@ -57,106 +57,106 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_free(
- void *storage,
- const axis2_env_t *envv);
+ void *storage,
+ const axis2_env_t *envv);
sandesha2_transaction_t *AXIS2_CALL
sandesha2_storage_mgr_get_transaction(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
sandesha2_create_seq_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_create_seq_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
sandesha2_next_msg_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_next_msg_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
sandesha2_sender_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_retransmitter_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
sandesha2_seq_property_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_seq_property_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
sandesha2_invoker_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_storage_map_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_set_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
axis2_conf_ctx_t *AXIS2_CALL
sandesha2_storage_mgr_get_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_init(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx);
axis2_msg_ctx_t *AXIS2_CALL
sandesha2_storage_mgr_retrieve_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_conf_ctx_t *conf_ctx);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_conf_ctx_t *conf_ctx);
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_store_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_msg_ctx_t *msg_ctx);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_msg_ctx_t *msg_ctx);
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_update_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_msg_ctx_t *msg_ctx);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_msg_ctx_t *msg_ctx);
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_remove_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key);
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_init_storage(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_module_desc_t *module_desc);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_module_desc_t *module_desc);
axiom_soap_envelope_t *AXIS2_CALL
sandesha2_storage_mgr_retrieve_soap_envelope(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key);
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_store_soap_envelope(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axiom_soap_envelope_t *soap_env,
- axis2_char_t *key);
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *soap_env,
+ axis2_char_t *key);
AXIS2_EXTERN sandesha2_storage_mgr_t * AXIS2_CALL
sandesha2_storage_mgr_create(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
axis2_ctx_t *ctx = NULL;
@@ -222,9 +222,9 @@
sandesha2_storage_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_instance(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -241,8 +241,8 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_free(
- void *storage,
- const axis2_env_t *env)
+ void *storage,
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -301,8 +301,8 @@
sandesha2_transaction_t *AXIS2_CALL
sandesha2_storage_mgr_get_transaction(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -314,8 +314,8 @@
sandesha2_create_seq_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_create_seq_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -327,8 +327,8 @@
sandesha2_next_msg_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_next_msg_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -340,8 +340,8 @@
sandesha2_sender_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_retransmitter_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -353,8 +353,8 @@
sandesha2_seq_property_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_seq_property_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -366,8 +366,8 @@
sandesha2_invoker_mgr_t *AXIS2_CALL
sandesha2_storage_mgr_get_storage_map_mgr(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -379,9 +379,9 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_set_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -396,8 +396,8 @@
axis2_conf_ctx_t *AXIS2_CALL
sandesha2_storage_mgr_get_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -410,9 +410,9 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_init(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
@@ -426,10 +426,10 @@
axis2_msg_ctx_t *AXIS2_CALL
sandesha2_storage_mgr_retrieve_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_conf_ctx_t *conf_ctx)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_conf_ctx_t *conf_ctx)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
axis2_hash_t *storage_map = NULL;
@@ -452,10 +452,10 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_store_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_msg_ctx_t *msg_ctx)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_msg_ctx_t *msg_ctx)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
axis2_hash_t *storage_map = NULL;
@@ -493,10 +493,10 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_update_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key,
- axis2_msg_ctx_t *msg_ctx)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key,
+ axis2_msg_ctx_t *msg_ctx)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
axis2_hash_t *storage_map = NULL;
@@ -537,9 +537,9 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_remove_msg_ctx(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key)
{
sandesha2_storage_mgr_impl_t *storage_impl = NULL;
axis2_hash_t *storage_map = NULL;
@@ -578,18 +578,18 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_init_storage(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_module_desc_t *module_desc)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_module_desc_t *module_desc)
{
return AXIS2_SUCCESS;
}
axiom_soap_envelope_t *AXIS2_CALL
sandesha2_storage_mgr_retrieve_soap_envelope(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axis2_char_t *key)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axis2_char_t *key)
{
/* TODO No real value */
return NULL;
@@ -597,10 +597,10 @@
axis2_status_t AXIS2_CALL
sandesha2_storage_mgr_store_soap_envelope(
- sandesha2_storage_mgr_t *storage,
- const axis2_env_t *env,
- axiom_soap_envelope_t *soap_env,
- axis2_char_t *key)
+ sandesha2_storage_mgr_t *storage,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *soap_env,
+ axis2_char_t *key)
{
/* TODO No real value */
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c?view=diff&rev=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c (original)
+++ webservices/sandesha/trunk/c/src/transport/sandesha2_transport_sender.c Tue Sep 5 02:49:58 2006
@@ -37,32 +37,34 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_init
- (axis2_transport_sender_t *transport_sender,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_transport_out_desc_t *transport_out);
+sandesha2_transport_sender_init(
+ axis2_transport_sender_t *transport_sender,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_transport_out_desc_t *transport_out);
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_cleanup
- (axis2_transport_sender_t *transport_sender,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+sandesha2_transport_sender_cleanup(
+ axis2_transport_sender_t *transport_sender,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_invoke
- (axis2_transport_sender_t *transport_sender,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+sandesha2_transport_sender_invoke (
+ axis2_transport_sender_t *transport_sender,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_free(axis2_transport_sender_t *transport_sender,
- const axis2_env_t *env);
+sandesha2_transport_sender_free(
+ axis2_transport_sender_t *transport_sender,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN axis2_transport_sender_t* AXIS2_CALL
-sandesha2_transport_sender_create(const axis2_env_t *env)
+sandesha2_transport_sender_create(
+ const axis2_env_t *env)
{
sandesha2_transport_sender_impl_t *transport_sender_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -101,8 +103,9 @@
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_free(axis2_transport_sender_t *transport_sender,
- const axis2_env_t *env)
+sandesha2_transport_sender_free(
+ axis2_transport_sender_t *transport_sender,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -116,11 +119,11 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_init
- (axis2_transport_sender_t *transport_sender,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_transport_out_desc_t *transport_out)
+sandesha2_transport_sender_init(
+ axis2_transport_sender_t *transport_sender,
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_transport_out_desc_t *transport_out)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
@@ -131,10 +134,10 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_cleanup
- (axis2_transport_sender_t *transport_sender,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
+sandesha2_transport_sender_cleanup(
+ axis2_transport_sender_t *transport_sender,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
@@ -145,10 +148,10 @@
axis2_status_t AXIS2_CALL
-sandesha2_transport_sender_invoke
- (axis2_transport_sender_t *transport_sender,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
+sandesha2_transport_sender_invoke (
+ axis2_transport_sender_t *transport_sender,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
{
axis2_property_t *property = NULL;
axis2_transport_out_desc_t *out_desc = NULL;
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=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Tue Sep 5 02:49:58 2006
@@ -182,7 +182,7 @@
retrans_mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_mgr, env);
key = axis2_uuid_gen(env);
ack_bean = sandesha2_sender_bean_create(env);
- SANDESHA2_SENDER_BEAN_SET_MSG_CTX_REF_KEY(ack_bean, env, key);
+ SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(ack_bean, env, key);
SANDESHA2_SENDER_BEAN_SET_MSG_ID(ack_bean, env,
AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(ack_msg_ctx, env));
SANDESHA2_SENDER_BEAN_SET_RESEND(ack_bean, env, AXIS2_FALSE);
@@ -344,9 +344,10 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-sandesha2_ack_mgr_verify_seq_completion(const axis2_env_t *env,
- axis2_array_list_t *ack_ranges,
- long last_msg_no)
+sandesha2_ack_mgr_verify_seq_completion(
+ const axis2_env_t *env,
+ axis2_array_list_t *ack_ranges,
+ long last_msg_no)
{
axis2_hash_t *hash = NULL;
axis2_char_t tmp[32];
@@ -384,9 +385,10 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_ack_mgr_piggyback_acks_if_present(const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- sandesha2_storage_mgr_t *storage_mgr)
+sandesha2_ack_mgr_piggyback_acks_if_present(
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ sandesha2_storage_mgr_t *storage_mgr)
{
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_sender_mgr_t *retrans_mgr = NULL;
@@ -394,6 +396,7 @@
sandesha2_sender_bean_t *find_bean = NULL;
axis2_char_t *to_str = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
+ axis2_endpoint_ref_t *to = NULL;
axis2_array_list_t *found_list = NULL;
int i = 0;
@@ -410,9 +413,10 @@
SANDESHA2_SENDER_BEAN_SET_MSG_TYPE(find_bean, env, SANDESHA2_MSG_TYPE_ACK);
SANDESHA2_SENDER_BEAN_SET_SEND(find_bean, env, AXIS2_TRUE);
SANDESHA2_SENDER_BEAN_SET_RESEND(find_bean, env, AXIS2_FALSE);
-
- to_str = AXIS2_ENDPOINT_REF_GET_ADDRESS(SANDESHA2_MSG_CTX_GET_TO(rm_msg_ctx,
- env), env);
+
+ to = SANDESHA2_MSG_CTX_GET_TO(rm_msg_ctx, env);
+ if(to)
+ to_str = AXIS2_ENDPOINT_REF_GET_ADDRESS(to, env);
found_list = SANDESHA2_SENDER_MGR_FIND_BY_SENDER_BEAN(retrans_mgr, env,
find_bean);
@@ -442,7 +446,7 @@
SANDESHA2_SENDER_MGR_REMOVE(retrans_mgr, env,
SANDESHA2_SENDER_BEAN_GET_MSG_ID(sender_bean, env));
ack_rm_msg = sandesha2_msg_init_init_msg(env, msg_ctx1);
- if(SANDESHA2_MSG_TYPE_ACK != SANDESHA2_MSG_CTX_GET_TYPE(ack_rm_msg,
+ if(SANDESHA2_MSG_TYPE_ACK != SANDESHA2_MSG_CTX_GET_MSG_TYPE(ack_rm_msg,
env))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid"
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Tue Sep 5 02:49:58 2006
@@ -571,7 +571,7 @@
AXIS2_MSG_CTX_SET_OP(fault_msg_ctx, env, op);
AXIS2_MSG_CTX_SET_OP_CTX(fault_msg_ctx, env, op_ctx);
- if(SANDESHA2_MSG_TYPE_CREATE_SEQ == SANDESHA2_MSG_CTX_GET_TYPE(rm_msg_ctx,
+ if(SANDESHA2_MSG_TYPE_CREATE_SEQ == SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx,
env))
{
sandesha2_create_seq_t *create_seq = NULL;
@@ -605,9 +605,11 @@
acks_to_str));
soap_ver = sandesha2_utils_get_soap_version(env,
SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(rm_msg_ctx, env));
- sandesha2_soap_env_creator_add_soap_env(env, fault_msg_ctx, soap_ver,
+ /* this method is not implemented. Uncomment this when implemented */
+ /* sandesha2_soap_env_creator_add_soap_env(env, fault_msg_ctx, soap_ver,
fault_data, SANDESHA2_MSG_CTX_GET_RM_NS_VAL(rm_msg_ctx,
- env));
+ env));*/
+
fault_rm_msg = sandesha2_msg_init_init_msg(env, fault_msg_ctx);
return fault_rm_msg;
}
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=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Tue Sep 5 02:49:58 2006
@@ -34,6 +34,7 @@
#include <sandesha2_msg_init.h>
#include <sandesha2_spec_specific_consts.h>
#include <sandesha2_terminate_seq.h>
+#include <sandesha2_identifier.h>
#include "../client/sandesha2_client_constants.h"
#include <axis2_conf_ctx.h>
@@ -53,15 +54,15 @@
static axis2_status_t
sandesha2_msg_creator_finalize_creation(
- const axis2_env_t *env,
- axis2_msg_ctx_t *related_msg,
- axis2_msg_ctx_t *new_msg);
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *related_msg,
+ axis2_msg_ctx_t *new_msg);
static axis2_status_t
sandesha2_msg_creator_init_creation(
- const axis2_env_t *env,
- axis2_msg_ctx_t *related_msg,
- axis2_msg_ctx_t *new_msg);
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *related_msg,
+ axis2_msg_ctx_t *new_msg);
/**
* Create a new create_seq_msg
@@ -72,11 +73,11 @@
*/
sandesha2_msg_ctx_t *AXIS2_CALL
sandesha2_msg_creator_create_create_seq_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *application_rm_msg,
- axis2_char_t *internal_seq_id,
- axis2_char_t *acks_to,
- sandesha2_storage_mgr_t *storage_mgr)
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *application_rm_msg,
+ axis2_char_t *internal_seq_id,
+ axis2_char_t *acks_to,
+ sandesha2_storage_mgr_t *storage_mgr)
{
axis2_msg_ctx_t *application_msg_ctx = NULL;
axis2_msg_ctx_t *create_seq_msg_ctx = NULL;
@@ -196,7 +197,7 @@
offer_part = sandesha2_seq_offer_create(env, rm_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
- SANDESHA2_IDENTIFIER_SET_IDENTIFER(identifier, env, offered_seq);
+ SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, offered_seq);
SANDESHA2_SEQ_OFFER_SET_IDENTIFIER(offer_part, env, identifier);
SANDESHA2_CREATE_SEQ_SET_SEQ_OFFER(create_seq_part, env, offer_part);
}
@@ -260,11 +261,11 @@
*/
sandesha2_msg_ctx_t *
sandesha2_msg_creator_create_create_seq_res_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *create_seq_msg,
- axis2_msg_ctx_t *out_msg,
- axis2_char_t *new_seq_id,
- sandesha2_storage_mgr_t *storage_mgr)
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *create_seq_msg,
+ axis2_msg_ctx_t *out_msg,
+ axis2_char_t *new_seq_id,
+ sandesha2_storage_mgr_t *storage_mgr)
{
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_ctx_t *ctx = NULL;
@@ -491,7 +492,8 @@
ref_rm_msg, terminate_seq_op);
terminate_seq_op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(terminate_seq_msg_ctx, env);
terminate_seq_msg_id = AXIS2_MSG_CTX_GET_MSG_ID(terminate_seq_msg_ctx, env);
- AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, terminate_seq_msg_id,
+ if(terminate_seq_msg_id)
+ AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, terminate_seq_msg_id,
terminate_seq_op_ctx);
ref_msg_op = AXIS2_MSG_CTX_GET_OP(ref_msg_ctx, env);
terminate_seq_op = AXIS2_MSG_CTX_GET_OP(terminate_seq_msg_ctx, env);
@@ -503,11 +505,11 @@
axis2_array_list_t *inflow = NULL;
outflow = AXIS2_OP_GET_OUT_FLOW(ref_msg_op, env);
- AXIS2_OP_SET_PHASES_OUTFLOW(terminate_seq_op, env, outflow);
+ AXIS2_OP_SET_OUT_FLOW(terminate_seq_op, env, outflow);
out_fault_flow = AXIS2_OP_GET_FAULT_OUT_FLOW(ref_msg_op, env);
- AXIS2_OP_SET_PHASES_OUT_FAULT_FLOW(terminate_seq_op, env, out_fault_flow);
+ AXIS2_OP_SET_FAULT_OUT_FLOW(terminate_seq_op, env, out_fault_flow);
in_fault_flow = AXIS2_OP_GET_FAULT_IN_FLOW(ref_msg_op, env);
- AXIS2_OP_SET_PHASES_IN_FAULT_FLOW(terminate_seq_op, env, in_fault_flow);
+ AXIS2_OP_SET_FAULT_IN_FLOW(terminate_seq_op, env, in_fault_flow);
inflow = AXIS2_OP_GET_IN_FLOW(ref_msg_op, env);
AXIS2_OP_SET_IN_FLOW(terminate_seq_op, env, inflow);
}
@@ -534,18 +536,19 @@
}
temp_msg_id = axis2_uuid_gen(env);
AXIS2_MSG_CTX_SET_MESSAGE_ID(terminate_seq_msg_ctx, env, temp_msg_id);
- ref_msg_op = AXIS2_MSG_CTX_GET_OP(ref_msg_ctx, env);
+ /*ref_msg_op = AXIS2_MSG_CTX_GET_OP(ref_msg_ctx, env);
if(ref_msg_op)
{
axis2_array_list_t *outphases = NULL;
+ axis2_array_list_t *out_fault_phases = NULL;
outphases = AXIS2_OP_GET_OUT_FLOW(ref_msg_op, env);
+ out_fault_phases = AXIS2_OP_GET_FAULT_OUT_FLOW(ref_msg_op, env);
if(outphases)
- {
- AXIS2_OP_SET_PHASES_OUTFLOW(terminate_seq_op, env, outphases);
- AXIS2_OP_SET_PHASES_OUT_FAULT_FLOW(terminate_seq_op, env, outphases);
- }
- }
+ AXIS2_OP_SET_OUT_FLOW(terminate_seq_op, env, outphases);
+ if(out_fault_phases)
+ AXIS2_OP_SET_FAULT_OUT_FLOW(terminate_seq_op, env, out_fault_phases);
+ }*/
temp_envelope = SANDESHA2_MSG_CTX_GET_SOAP_ENVELOPE(ref_msg_ctx, env);
soap_version = sandesha2_utils_get_soap_version(env, temp_envelope);
envelope = axiom_soap_envelope_create_default_soap_envelope(env, soap_version);
@@ -553,7 +556,7 @@
terminate_seq = sandesha2_terminate_seq_create(env, rm_ns_value);
identifier = sandesha2_identifier_create(env, rm_ns_value);
- SANDESHA2_IDENTIFIER_SET_IDENTIFER(identifier, env, seq_id);
+ SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, seq_id);
SANDESHA2_TERMINATE_SEQ_SET_IDENTIFIER(terminate_seq, env, identifier);
SANDESHA2_MSG_CTX_SET_MSG_PART(terminate_rm_msg, env,
SANDESHA2_MSG_PART_TERMINATE_SEQ,
@@ -592,7 +595,7 @@
terminate_seq_res = sandesha2_terminate_seq_res_create(env, rm_ns_val);
identifier = sandesha2_identifier_create(env, rm_ns_val);
- SANDESHA2_IDENTIFIER_SET_IDENTIFER(identifier, env, seq_id);
+ SANDESHA2_IDENTIFIER_SET_IDENTIFIER(identifier, env, seq_id);
SANDESHA2_TERMINATE_SEQ_RES_SET_IDENTIFIER(terminate_seq_res, env,
identifier);
soap_envelope = axiom_soap_envelope_create_default_soap_envelope(env,
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=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Tue Sep 5 02:49:58 2006
@@ -56,9 +56,9 @@
*/
static axis2_status_t
populate_rm_msg_ctx(
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- sandesha2_msg_ctx_t *rm_msg_ctx);
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
/**
* This is used to validate the message.
@@ -68,8 +68,12 @@
* @return
*/
static axis2_bool_t validate_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx);
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx);
+
+static void add_op_if_null(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
/**
* Called to create a rm_msg_ctx out of an message context. Finds out things
@@ -85,28 +89,29 @@
*/
sandesha2_msg_ctx_t *
sandesha2_msg_init_init_msg(
- const axis2_env_t *env,
- axis2_msg_ctx_t *ctx)
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
{
sandesha2_msg_ctx_t *rm_msg_ctx = NULL;
- rm_msg_ctx = sandesha2_msg_ctx_create(env, ctx);
- populate_rm_msg_ctx(env, ctx, rm_msg_ctx);
+ rm_msg_ctx = sandesha2_msg_ctx_create(env, msg_ctx);
+ populate_rm_msg_ctx(env, msg_ctx, rm_msg_ctx);
validate_msg(env, rm_msg_ctx);
return rm_msg_ctx;
}
static axis2_status_t
populate_rm_msg_ctx(
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- sandesha2_msg_ctx_t *rm_msg_ctx)
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx,
+ sandesha2_msg_ctx_t *rm_msg_ctx)
{
axis2_char_t *addressing_ns = NULL;
axis2_char_t *addressing_ns_value = NULL;
axis2_char_t *rm_ns = NULL;
axis2_char_t *action = NULL;
axis2_property_t *prop = NULL;
+ axis2_ctx_t *ctx = NULL;
axiom_soap_envelope_t *envelope = NULL;
sandesha2_rm_elements_t *elements = NULL;
sandesha2_create_seq_t *create_seq = NULL;
@@ -122,7 +127,8 @@
/* If client side and the addressing version is not set.
* Assuming the default addressing version.
*/
- prop = AXIS2_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
+ ctx = AXIS2_MSG_CTX_GET_BASE(msg_ctx, env);
+ prop = AXIS2_CTX_GET_PROPERTY(ctx, env, AXIS2_WSA_VERSION, AXIS2_FALSE);
if(NULL != prop)
addressing_ns = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(prop, env);
@@ -154,6 +160,7 @@
(sandesha2_iom_rm_part_t *) create_seq_res);
rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
(sandesha2_iom_rm_element_t *) create_seq_res, env);
+ add_op_if_null(env, msg_ctx);
}
seq = SANDESHA2_RM_ELEMENTS_GET_SEQ(elements, env);
if(seq)
@@ -173,6 +180,7 @@
(sandesha2_iom_rm_part_t *) seq_ack);
rm_ns = SANDESHA2_IOM_RM_ELEMENT_GET_NAMESPACE_VALUE(
(sandesha2_iom_rm_element_t *) seq_ack, env);
+ add_op_if_null(env, msg_ctx);
}
terminate_seq = SANDESHA2_RM_ELEMENTS_GET_TERMINATE_SEQ(elements, env);
if(terminate_seq)
@@ -400,3 +408,53 @@
return AXIS2_TRUE;
}
+static void add_op_if_null(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
+{
+ axis2_op_t *op = NULL;
+
+ op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
+ if(NULL == 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);
+ if (!tmp_qname)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
+ 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)
+ {
+ 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;
+ }
+ }
+}
+
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Tue Sep 5 02:49:58 2006
@@ -215,11 +215,11 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_terminate_sending_side(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- axis2_bool_t svr_side,
- sandesha2_storage_mgr_t *storage_man)
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ axis2_bool_t svr_side,
+ sandesha2_storage_mgr_t *storage_man)
{
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *seq_term_bean = NULL;
@@ -241,10 +241,10 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_do_updates_if_needed(
- const axis2_env_t *env,
- axis2_char_t *seq_id,
- sandesha2_seq_property_bean_t *prop_bean,
- sandesha2_seq_property_mgr_t *prop_mgr)
+ const axis2_env_t *env,
+ axis2_char_t *seq_id,
+ sandesha2_seq_property_bean_t *prop_bean,
+ sandesha2_seq_property_mgr_t *prop_mgr)
{
axis2_bool_t add_entry_with_seq_id = AXIS2_FALSE;
axis2_char_t *name = NULL;
@@ -285,8 +285,8 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
sandesha2_terminate_mgr_is_property_deletable(
- const axis2_env_t *env,
- axis2_char_t *name)
+ const axis2_env_t *env,
+ axis2_char_t *name)
{
axis2_bool_t deletable = AXIS2_TRUE;
@@ -311,11 +311,11 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_time_out_sending_side_seq(
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id,
- axis2_bool_t svr_side,
- sandesha2_storage_mgr_t *storage_man)
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_char_t *seq_id,
+ axis2_bool_t svr_side,
+ sandesha2_storage_mgr_t *storage_man)
{
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *seq_term_bean = NULL;
@@ -449,11 +449,11 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_terminate_mgr_add_terminate_seq_msg(
- const axis2_env_t *env,
- sandesha2_msg_ctx_t *rm_msg_ctx,
- axis2_char_t *out_seq_id,
- axis2_char_t *int_seq_id,
- sandesha2_storage_mgr_t *storage_man)
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *rm_msg_ctx,
+ axis2_char_t *out_seq_id,
+ axis2_char_t *int_seq_id,
+ sandesha2_storage_mgr_t *storage_man)
{
axis2_msg_ctx_t *msg_ctx = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
Modified: webservices/sandesha/trunk/c/src/util/utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/utils.c?view=diff&rev=440308&r1=440307&r2=440308
==============================================================================
--- webservices/sandesha/trunk/c/src/util/utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/utils.c Tue Sep 5 02:49:58 2006
@@ -540,9 +540,10 @@
}
AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
-sandesha2_utils_create_new_related_msg_ctx(const axis2_env_t *env,
- sandesha2_msg_ctx_t *ref_rm_msg,
- axis2_op_t *op)
+sandesha2_utils_create_new_related_msg_ctx(
+ const axis2_env_t *env,
+ sandesha2_msg_ctx_t *ref_rm_msg,
+ axis2_op_t *op)
{
axis2_msg_ctx_t *ref_msg = NULL;
axis2_msg_ctx_t *new_msg = NULL;
@@ -681,8 +682,8 @@
AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
if(NULL != req_msg)
{
- property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env,
- AXIS2_TRANSPORT_URL, AXIS2_FALSE);
+ property = AXIS2_MSG_CTX_GET_PROPERTY(req_msg, env,
+ AXIS2_WSA_VERSION, AXIS2_FALSE);
if(NULL != property)
addr_ver = AXIS2_PROPERTY_GET_VALUE(property, env);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org