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 2008/06/16 10:57:29 UTC
svn commit: r668081 - in
/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008:
samples/RMSampleService/rm_sample_svc.c src/msgprocessors/app_msg_processor.c
src/storage/sqlite/permanent_storage_mgr.c src/util/terminate_mgr.c
Author: damitha
Date: Mon Jun 16 01:57:28 2008
New Revision: 668081
URL: http://svn.apache.org/viewvc?rev=668081&view=rev
Log:
Fixed retransmission count for sending create sequence message
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c?rev=668081&r1=668080&r2=668081&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c Mon Jun 16 01:57:28 2008
@@ -328,7 +328,7 @@
axiom_data_handler_write_to(data_handler, env);
ret_node = build_response1(env, base64text);
}
- else /* nothing came */
+ else /* attachement missing */
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_ATTACHMENT_MISSING,
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c?rev=668081&r1=668080&r2=668081&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/app_msg_processor.c Mon Jun 16 01:57:28 2008
@@ -1797,9 +1797,9 @@
axis2_msg_ctx_t *msg_ctx = NULL;
sandesha2_create_seq_t *create_seq_part = NULL;
sandesha2_seq_property_bean_t *rms_sequence_bean = NULL;
- sandesha2_msg_ctx_t *create_seq_rm_msg = NULL;
+ sandesha2_msg_ctx_t *create_seq_rm_msg_ctx = NULL;
sandesha2_seq_offer_t *seq_offer = NULL;
- axis2_msg_ctx_t *create_seq_msg = NULL;
+ axis2_msg_ctx_t *create_seq_msg_ctx = NULL;
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
axis2_char_t *addr_ns_uri = NULL;
axis2_char_t *anon_uri = NULL;
@@ -1810,6 +1810,13 @@
axis2_op_t *create_seq_op = NULL;
axis2_op_ctx_t *create_seq_op_ctx = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ axis2_bool_t continue_sending = AXIS2_TRUE;
+ long retrans_interval = -1;
+ sandesha2_property_bean_t *property_bean = NULL;
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_char_t *msg_id = NULL;
+ sandesha2_sender_bean_t *create_sequence_sender_bean = NULL;
+ long millisecs = 0;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[Sandesha2]Entry:sandesha2_app_msg_processor_send_create_seq_msg");
@@ -1822,16 +1829,16 @@
AXIS2_PARAM_CHECK(env->error, sender_mgr, AXIS2_FAILURE);
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
- create_seq_rm_msg = sandesha2_msg_creator_create_create_seq_msg(env, rm_msg_ctx, internal_sequence_id,
+ create_seq_rm_msg_ctx = sandesha2_msg_creator_create_create_seq_msg(env, rm_msg_ctx, internal_sequence_id,
acks_to, seq_prop_mgr);
- if(!create_seq_rm_msg)
+ if(!create_seq_rm_msg_ctx)
{
return AXIS2_FAILURE;
}
- sandesha2_msg_ctx_set_flow(create_seq_rm_msg, env, SANDESHA2_MSG_CTX_OUT_FLOW);
+ sandesha2_msg_ctx_set_flow(create_seq_rm_msg_ctx, env, SANDESHA2_MSG_CTX_OUT_FLOW);
- create_seq_part = sandesha2_msg_ctx_get_create_seq(create_seq_rm_msg, env);
+ create_seq_part = sandesha2_msg_ctx_get_create_seq(create_seq_rm_msg_ctx, env);
{
sandesha2_seq_property_bean_t *to_epr_bean = NULL;
@@ -1863,16 +1870,20 @@
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, offer_seq_bean);
}
- create_seq_msg = sandesha2_msg_ctx_get_msg_ctx(create_seq_rm_msg, env);
- if(!create_seq_msg)
+ create_seq_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(create_seq_rm_msg_ctx, env);
+ if(!create_seq_msg_ctx)
{
return AXIS2_FAILURE;
}
- axis2_msg_ctx_set_relates_to(create_seq_msg, env, NULL);
+ axis2_msg_ctx_set_relates_to(create_seq_msg_ctx, env, NULL);
+
+ /* Create sequence message created here will be used by create sequence response message processor
+ * to retrieve message id
+ */
create_sequence_msg_store_key = axutil_uuid_gen(env);
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env, internal_sequence_id,
- (axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(create_seq_msg, env), NULL);
+ (axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(create_seq_msg_ctx, env), NULL);
sandesha2_create_seq_bean_set_ref_msg_store_key(create_seq_bean, env, create_sequence_msg_store_key);
sandesha2_create_seq_mgr_insert(create_seq_mgr, env, create_seq_bean);
@@ -1886,25 +1897,38 @@
AXIS2_FREE(env->allocator, addr_ns_uri);
}
- if(!axis2_msg_ctx_get_reply_to(create_seq_msg, env))
+ if(!axis2_msg_ctx_get_reply_to(create_seq_msg_ctx, env))
{
axis2_endpoint_ref_t *cs_epr = NULL;
cs_epr = axis2_endpoint_ref_create(env, anon_uri);
- axis2_msg_ctx_set_reply_to(create_seq_msg, env, cs_epr);
+ axis2_msg_ctx_set_reply_to(create_seq_msg_ctx, env, cs_epr);
}
- engine = axis2_engine_create(env, axis2_msg_ctx_get_conf_ctx(create_seq_msg, env));
+ create_sequence_sender_bean = sandesha2_sender_bean_create(env);
+ sandesha2_sender_bean_set_msg_ctx_ref_key(create_sequence_sender_bean, env, create_sequence_msg_store_key);
+ millisecs = sandesha2_utils_get_current_time_in_millis(env);
+ sandesha2_sender_bean_set_time_to_send(create_sequence_sender_bean, env, millisecs);
+ msg_id = sandesha2_msg_ctx_get_msg_id(create_seq_rm_msg_ctx, env);
+ sandesha2_sender_bean_set_msg_id(create_sequence_sender_bean, env, msg_id);
+ sandesha2_sender_bean_set_internal_seq_id(create_sequence_sender_bean, env, internal_sequence_id);
+ sandesha2_sender_bean_set_send(create_sequence_sender_bean, env, AXIS2_TRUE);
+ sandesha2_sender_bean_set_msg_type(create_sequence_sender_bean, env, SANDESHA2_MSG_TYPE_CREATE_SEQ);
+ sandesha2_sender_mgr_insert(sender_mgr, env, create_sequence_sender_bean);
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, create_sequence_msg_store_key, create_seq_msg_ctx);
+
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(create_seq_msg_ctx, env);
+ engine = axis2_engine_create(env, conf_ctx);
- if(create_seq_rm_msg)
+ if(create_seq_rm_msg_ctx)
{
- sandesha2_msg_ctx_free(create_seq_rm_msg, env);
+ sandesha2_msg_ctx_free(create_seq_rm_msg_ctx, env);
}
- if(axis2_engine_send(engine, env, create_seq_msg))
+ if(axis2_engine_send(engine, env, create_seq_msg_ctx))
{
- if(!axis2_msg_ctx_get_server_side(create_seq_msg, env))
+ if(!axis2_msg_ctx_get_server_side(create_seq_msg_ctx, env))
{
- status = sandesha2_app_msg_processor_process_create_seq_response(env, create_seq_msg,
+ status = sandesha2_app_msg_processor_process_create_seq_response(env, create_seq_msg_ctx,
storage_mgr);
}
}
@@ -1918,27 +1942,44 @@
axis2_engine_free(engine, env);
}
+ property_bean = sandesha2_utils_get_property_bean(env, axis2_conf_ctx_get_conf(conf_ctx, env));
+ retrans_interval = sandesha2_property_bean_get_retrans_interval(property_bean, env);
+
rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, internal_sequence_id,
SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
- create_seq_op = axis2_msg_ctx_get_op(create_seq_msg, env);
- transport_out = axis2_msg_ctx_get_transport_out_desc(create_seq_msg, env);
+
+ create_seq_op = axis2_msg_ctx_get_op(create_seq_msg_ctx, env);
+ transport_out = axis2_msg_ctx_get_transport_out_desc(create_seq_msg_ctx, env);
transport_sender = axis2_transport_out_desc_get_sender(transport_out, env);
while(!rms_sequence_bean)
{
- AXIS2_SLEEP(2);
+ continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env, create_sequence_sender_bean,
+ conf_ctx, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
+
+ sandesha2_sender_mgr_update(sender_mgr, env, create_sequence_sender_bean);
+
+ if(!continue_sending)
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Do not continue sending the create sequence message");
+ break;
+ }
+
+ AXIS2_SLEEP(retrans_interval);
+
if(transport_sender)
{
/* This is neccessary to avoid a double free */
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, NULL);
- if(!AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, create_seq_msg))
+ if(!AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, create_seq_msg_ctx))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Transport sender invoke failed");
}
}
- if(!axis2_msg_ctx_get_server_side(create_seq_msg, env))
+ if(!axis2_msg_ctx_get_server_side(create_seq_msg_ctx, env))
{
- status = sandesha2_app_msg_processor_process_create_seq_response(env, create_seq_msg,
+ status = sandesha2_app_msg_processor_process_create_seq_response(env, create_seq_msg_ctx,
storage_mgr);
if(AXIS2_SUCCESS != status)
@@ -1951,7 +1992,12 @@
SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
}
- create_seq_op_ctx = axis2_msg_ctx_get_op_ctx(create_seq_msg, env);
+ if(create_sequence_sender_bean)
+ {
+ sandesha2_sender_bean_free(create_sequence_sender_bean, env);
+ }
+
+ create_seq_op_ctx = axis2_msg_ctx_get_op_ctx(create_seq_msg_ctx, env);
if(create_seq_op_ctx)
{
axis2_op_ctx_free(create_seq_op_ctx, env);
@@ -2173,7 +2219,7 @@
sandesha2_msg_number_t *msg_number = NULL;
axis2_msg_ctx_t *req_msg = NULL;
axis2_char_t *rms_sequence_id = NULL;
- sandesha2_sender_bean_t *app_msg_bean = NULL;
+ sandesha2_sender_bean_t *app_msg_sender_bean = NULL;
long millisecs = 0;
axutil_property_t *property = NULL;
axis2_engine_t *engine = NULL;
@@ -2394,8 +2440,6 @@
/* TODO add_ack_requested */
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
- app_msg_bean = sandesha2_sender_bean_create(env);
- sandesha2_sender_bean_set_internal_seq_id(app_msg_bean, env, internal_sequence_id);
op_ctx = axis2_msg_ctx_get_op_ctx(app_msg_ctx, env);
if(op_ctx)
@@ -2482,58 +2526,61 @@
AXIS2_FREE(env->allocator, to_addr);
}
- sandesha2_sender_bean_set_msg_ctx_ref_key(app_msg_bean, env, storage_key);
+ temp_op_ctx = axis2_msg_ctx_get_op_ctx(app_msg_ctx, env);
+ if(temp_op_ctx)
+ {
+ axis2_op_t *op = NULL;
+
+ op = axis2_op_ctx_get_op(temp_op_ctx, env);
+ mep = axis2_op_get_msg_exchange_pattern(op, env);
+ }
+
+ app_msg_sender_bean = sandesha2_sender_bean_create(env);
+ sandesha2_sender_bean_set_internal_seq_id(app_msg_sender_bean, env, internal_sequence_id);
+ sandesha2_sender_bean_set_msg_ctx_ref_key(app_msg_sender_bean, env, storage_key);
millisecs = sandesha2_utils_get_current_time_in_millis(env);
- sandesha2_sender_bean_set_time_to_send(app_msg_bean, env, millisecs);
+ sandesha2_sender_bean_set_time_to_send(app_msg_sender_bean, env, millisecs);
msg_id = sandesha2_msg_ctx_get_msg_id(rm_msg_ctx, env);
- sandesha2_sender_bean_set_msg_id(app_msg_bean, env, msg_id);
- sandesha2_sender_bean_set_msg_no(app_msg_bean, env, msg_num);
- sandesha2_sender_bean_set_msg_type(app_msg_bean, env, SANDESHA2_MSG_TYPE_APPLICATION);
+ sandesha2_sender_bean_set_msg_id(app_msg_sender_bean, env, msg_id);
+ sandesha2_sender_bean_set_msg_no(app_msg_sender_bean, env, msg_num);
+ sandesha2_sender_bean_set_msg_type(app_msg_sender_bean, env, SANDESHA2_MSG_TYPE_APPLICATION);
if(!rms_sequence_id)
{
- sandesha2_sender_bean_set_send(app_msg_bean, env, AXIS2_FALSE);
+ sandesha2_sender_bean_set_send(app_msg_sender_bean, env, AXIS2_FALSE);
}
else
{
- sandesha2_sender_bean_set_send(app_msg_bean, env, AXIS2_TRUE);
+ sandesha2_sender_bean_set_send(app_msg_sender_bean, env, AXIS2_TRUE);
property = axutil_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(app_msg_ctx, env, SANDESHA2_SET_SEND_TO_TRUE, property);
}
-
- temp_op_ctx = axis2_msg_ctx_get_op_ctx(app_msg_ctx, env);
- if(temp_op_ctx)
- {
- axis2_op_t *op = NULL;
-
- op = axis2_op_ctx_get_op(temp_op_ctx, env);
- mep = axis2_op_get_msg_exchange_pattern(op, env);
- }
-
/**
* When we store application message context as below it should be noted
* that at Sandesha2/C client application side this is actually stored in
* in-memory whereas in the web service side it is actually stored in
* database only.
*/
- sandesha2_sender_mgr_insert(sender_mgr, env, app_msg_bean);
+ sandesha2_sender_mgr_insert(sender_mgr, env, app_msg_sender_bean);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, storage_key, app_msg_ctx);
- continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env, app_msg_bean,
+ continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env, app_msg_sender_bean,
conf_ctx, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
+ if(app_msg_sender_bean)
+ {
+ sandesha2_sender_bean_free(app_msg_sender_bean, env);
+ }
+
if(!continue_sending)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Do not continue sending the message");
+
if(rm_version)
{
AXIS2_FREE(env->allocator, rm_version);
}
- if(app_msg_bean)
- {
- sandesha2_sender_bean_free(app_msg_bean, env);
- }
if(reply_to_addr)
{
@@ -2625,7 +2672,6 @@
}
else
{
- sandesha2_sender_bean_free(sender_bean, env);
transport_out = axis2_msg_ctx_get_transport_out_desc(app_msg_ctx, env);
if(transport_out)
{
@@ -2640,10 +2686,15 @@
while(AXIS2_TRUE)
{
- continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env, app_msg_bean,
+ continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env, sender_bean,
conf_ctx, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
- sandesha2_sender_mgr_update(sender_mgr, env, app_msg_bean);
+ sandesha2_sender_mgr_update(sender_mgr, env, sender_bean);
+
+ if(sender_bean)
+ {
+ sandesha2_sender_bean_free(sender_bean, env);
+ }
if(!continue_sending)
{
@@ -2685,10 +2736,6 @@
/* There is no pending message to send. So exit from the loop. */
break;
}
- else
- {
- sandesha2_sender_bean_free(sender_bean, env);
- }
}
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c?rev=668081&r1=668080&r2=668081&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_storage_mgr.c Mon Jun 16 01:57:28 2008
@@ -797,7 +797,10 @@
{
sandesha2_msg_store_bean_set_persistent_property_str(bean, env,
prop_str);
- AXIS2_FREE(env->allocator, prop_str);
+ if(prop_str && axutil_strlen(prop_str) > 0)
+ {
+ AXIS2_FREE(env->allocator, prop_str);
+ }
}
/* setting the request message if this a response message.*/
op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
@@ -904,7 +907,7 @@
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, key,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR,
value, NULL);
- if(temp_str && axutil_strlen(temp_str)> 0)
+ if(temp_str && axutil_strlen(temp_str) > 0)
AXIS2_FREE(env->allocator, temp_str);
}
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c?rev=668081&r1=668080&r2=668081&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/terminate_mgr.c Mon Jun 16 01:57:28 2008
@@ -768,7 +768,7 @@
axis2_char_t *rm_ver = NULL;
sandesha2_seq_property_bean_t *transport_to_bean = NULL;
axis2_char_t *key = NULL;
- sandesha2_sender_bean_t *terminate_bean = NULL;
+ sandesha2_sender_bean_t *terminate_sender_bean = NULL;
sandesha2_seq_property_bean_t *terminate_added = NULL;
sandesha2_seq_property_bean_t *replay_bean = NULL;
axis2_engine_t *engine = NULL;
@@ -926,26 +926,26 @@
}
key = axutil_uuid_gen(env);
- terminate_bean = sandesha2_sender_bean_create(env);
- sandesha2_sender_bean_set_msg_ctx_ref_key(terminate_bean, env, key);
+ terminate_sender_bean = sandesha2_sender_bean_create(env);
+ sandesha2_sender_bean_set_msg_ctx_ref_key(terminate_sender_bean, env, key);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, terminate_msg_ctx);
property_bean = sandesha2_utils_get_property_bean(env, axis2_conf_ctx_get_conf(conf_ctx, env));
terminate_delay = sandesha2_property_bean_get_terminate_delay(property_bean, env);
send_time = sandesha2_utils_get_current_time_in_millis(env) + terminate_delay;
- sandesha2_sender_bean_set_time_to_send(terminate_bean, env, send_time);
+ sandesha2_sender_bean_set_time_to_send(terminate_sender_bean, env, send_time);
msg_id = sandesha2_msg_ctx_get_msg_id(terminate_rm_msg_ctx, env);
- sandesha2_sender_bean_set_msg_id(terminate_bean, env, msg_id);
+ sandesha2_sender_bean_set_msg_id(terminate_sender_bean, env, msg_id);
- sandesha2_sender_bean_set_send(terminate_bean, env, AXIS2_TRUE);
+ sandesha2_sender_bean_set_send(terminate_sender_bean, env, AXIS2_TRUE);
- sandesha2_sender_bean_set_seq_id(terminate_bean, env, rms_sequence_id);
- sandesha2_sender_bean_set_internal_seq_id(terminate_bean, env, internal_sequence_id);
+ sandesha2_sender_bean_set_seq_id(terminate_sender_bean, env, rms_sequence_id);
+ sandesha2_sender_bean_set_internal_seq_id(terminate_sender_bean, env, internal_sequence_id);
- sandesha2_sender_bean_set_msg_type(terminate_bean, env, SANDESHA2_MSG_TYPE_TERMINATE_SEQ);
+ sandesha2_sender_bean_set_msg_type(terminate_sender_bean, env, SANDESHA2_MSG_TYPE_TERMINATE_SEQ);
- sandesha2_sender_bean_set_resend(terminate_bean, env, AXIS2_FALSE);
- sandesha2_sender_mgr_insert(sender_mgr, env, terminate_bean);
+ sandesha2_sender_bean_set_resend(terminate_sender_bean, env, AXIS2_FALSE);
+ sandesha2_sender_mgr_insert(sender_mgr, env, terminate_sender_bean);
property = axutil_property_create_with_args(env, 0, AXIS2_TRUE, 0, key);
axis2_msg_ctx_set_property(terminate_msg_ctx, env, SANDESHA2_MESSAGE_STORE_KEY, property);
@@ -983,7 +983,7 @@
axis2_transport_out_desc_t *transport_out = NULL;
axis2_transport_sender_t *transport_sender = NULL;
- sandesha2_sender_bean_set_resend(terminate_bean, env, AXIS2_TRUE);
+ sandesha2_sender_bean_set_resend(terminate_sender_bean, env, AXIS2_TRUE);
soap_ns_uri = axis2_msg_ctx_get_is_soap_11(terminate_msg_ctx, env) ?
AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI:
AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
@@ -1018,10 +1018,10 @@
axis2_bool_t continue_sending = AXIS2_FALSE;
long retrans_delay = -1;
- continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env, terminate_bean,
+ continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env, terminate_sender_bean,
conf_ctx, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
- sandesha2_sender_mgr_update(sender_mgr, env, terminate_bean);
+ sandesha2_sender_mgr_update(sender_mgr, env, terminate_sender_bean);
if(!continue_sending)
{
@@ -1062,9 +1062,9 @@
}
}
- if(terminate_bean)
+ if(terminate_sender_bean)
{
- sandesha2_sender_bean_free(terminate_bean, env);
+ sandesha2_sender_bean_free(terminate_sender_bean, env);
}
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, internal_sequence_id, is_svr_side,
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org