[prev in list] [next in list] [prev in thread] [next in thread]
List: sandesha-dev
Subject: svn commit: r661995 - in
From: damitha () apache ! org
Date: 2008-05-31 10:07:13
Message-ID: 20080531100713.F36E32388A09 () eris ! apache ! org
[Download RAW message or body]
Author: damitha
Date: Sat May 31 03:07:13 2008
New Revision: 661995
URL: http://svn.apache.org/viewvc?rev=661995&view=rev
Log:
merging with branch 30may2008
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac
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/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.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/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac?rev=661995&r1=661994&r2=661995&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac \
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac \
Sat May 31 03:07:13 2008 @@ -22,7 +22,7 @@
dnl Checks for libraries.
AC_CHECK_LIB(dl, dlopen)
-CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE"
+CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -g"
LDFLAGS="-L$AXIS2C_HOME/lib -lpthread"
dnl Checks for header files.
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=661995&r1=661994&r2=661995&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 \
Sat May 31 03:07:13 2008 @@ -124,7 +124,6 @@
const axutil_env_t *env,
sandesha2_msg_ctx_t *msg_ctx,
axis2_char_t *internal_seq_id,
- axis2_char_t *out_seq_id,
long msg_num,
axis2_char_t *storage_key,
sandesha2_storage_mgr_t *storage_mgr,
@@ -872,6 +871,16 @@
* See sandesha2_app_msg_processor_send_app_msg() code.
*/
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Single channel duplex \
mode"); +
+ sandesha2_seq_t *sequence = sandesha2_msg_ctx_get_sequence(rm_msg_ctx, env);
+ axis2_char_t *rmd_sequence_id = \
sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(sequence, + \
env), env); + sandesha2_seq_property_bean_t *rms_internal_sequence_bean = \
sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, + rmd_sequence_id, \
SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID); +
+ axis2_char_t *rms_internal_sequence_id = \
sandesha2_seq_property_bean_get_value(rms_internal_sequence_bean, env); + \
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "rms_internal_sequence_id:%s", \
rms_internal_sequence_id); +
}
else
{
@@ -917,7 +926,6 @@
sandesha2_sender_mgr_t *sender_mgr = NULL;
axis2_bool_t is_svr_side = AXIS2_FALSE;
axis2_char_t *rms_internal_sequence_id = NULL;
- axis2_char_t *out_seq_id = NULL;
axis2_char_t *storage_key = NULL;
axis2_bool_t last_msg = AXIS2_FALSE;
axutil_property_t *property = NULL;
@@ -1577,8 +1585,7 @@
if(!dummy_msg)
{
status = sandesha2_app_msg_processor_send_app_msg(env, rm_msg_ctx, \
rms_internal_sequence_id,
- out_seq_id, msg_number, storage_key, storage_mgr, create_seq_mgr, \
seq_prop_mgr,
- sender_mgr);
+ msg_number, storage_key, storage_mgr, create_seq_mgr, seq_prop_mgr, \
sender_mgr); }
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
@@ -1641,8 +1648,9 @@
sandesha2_sender_mgr_t *sender_mgr,
sandesha2_seq_property_mgr_t *seq_prop_mgr)
{
- sandesha2_seq_t *seq = NULL;
- axis2_char_t *seq_id = NULL;
+ sandesha2_seq_t *sequence = NULL;
+ axis2_char_t *rmd_sequence_id = NULL;
+ axis2_char_t *rms_internal_sequence_id = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_ack_requested_t *ack_requested = NULL;
sandesha2_msg_ctx_t *ack_rm_msg = NULL;
@@ -1651,6 +1659,7 @@
axis2_bool_t is_svr_side = AXIS2_FALSE;
axis2_bool_t sent = AXIS2_FALSE;
sandesha2_seq_property_bean_t *int_seq_bean = NULL;
+ sandesha2_seq_property_bean_t *rms_internal_sequence_bean = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[Sandesha2] \
Entry:sandesha2_app_msg_processor_send_ack_if_reqd");
@@ -1658,8 +1667,10 @@
AXIS2_PARAM_CHECK(env->error, msg_str, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_prop_mgr, AXIS2_FAILURE);
- seq = sandesha2_msg_ctx_get_sequence(rm_msg_ctx, env);
- seq_id = sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(seq, \
env), env); + sequence = sandesha2_msg_ctx_get_sequence(rm_msg_ctx, env);
+ rmd_sequence_id = \
sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(sequence, + \
env), env); +
conf_ctx = axis2_msg_ctx_get_conf_ctx(sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, \
env), env); if(!conf_ctx)
{
@@ -1676,10 +1687,17 @@
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
}
- ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, rm_msg_ctx, seq_id, \
seq_prop_mgr); + ack_rm_msg = sandesha2_ack_mgr_generate_ack_msg(env, rm_msg_ctx, \
rmd_sequence_id, seq_prop_mgr); ack_msg_ctx = \
sandesha2_msg_ctx_get_msg_ctx(ack_rm_msg, env);
- int_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, seq_id,
+ rms_internal_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, \
env, + rmd_sequence_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
+
+ rms_internal_sequence_id = \
sandesha2_seq_property_bean_get_value(rms_internal_sequence_bean, env); +
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "rms_internal_sequence_id:%s", \
rms_internal_sequence_id); +
+ int_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
rmd_sequence_id, SANDESHA2_SEQ_PROP_SPECIAL_INTERNAL_SEQ_ID);
{
const axis2_char_t *related_msg_id = NULL;
@@ -1709,7 +1727,7 @@
sandesha2_sender_bean_set_msg_id(ack_bean, env, \
sandesha2_msg_ctx_get_msg_id(ack_rm_msg, env)); \
sandesha2_sender_bean_set_send(ack_bean, env, AXIS2_TRUE);
sandesha2_sender_bean_set_internal_seq_id(ack_bean, env, int_seq_id);
- sandesha2_sender_bean_set_seq_id(ack_bean, env, seq_id);
+ sandesha2_sender_bean_set_seq_id(ack_bean, env, rmd_sequence_id);
sandesha2_sender_bean_set_msg_type(ack_bean, env, \
SANDESHA2_MSG_TYPE_ACK); sandesha2_sender_bean_set_resend(ack_bean, env, \
AXIS2_FALSE); sandesha2_sender_mgr_insert(sender_mgr, env, ack_bean);
@@ -1763,7 +1781,7 @@
sandesha2_app_msg_processor_send_create_seq_msg(
const axutil_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
- axis2_char_t *internal_seq_id,
+ axis2_char_t *rms_internal_sequence_id,
axis2_char_t *acks_to,
sandesha2_storage_mgr_t *storage_mgr,
sandesha2_seq_property_mgr_t *seq_prop_mgr,
@@ -1779,7 +1797,7 @@
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
axis2_char_t *addr_ns_uri = NULL;
axis2_char_t *anon_uri = NULL;
- axis2_char_t *str_key = NULL;
+ axis2_char_t *create_sequence_msg_store_key = NULL;
axis2_transport_out_desc_t *transport_out = NULL;
axis2_transport_sender_t *transport_sender = NULL;
axis2_engine_t *engine = NULL;
@@ -1790,7 +1808,7 @@
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[Sandesha2]Entry:sandesha2_app_msg_processor_send_create_seq_msg");
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, rms_internal_sequence_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, acks_to, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, create_seq_mgr, AXIS2_FAILURE);
@@ -1798,7 +1816,7 @@
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_seq_id, + create_seq_rm_msg = \
sandesha2_msg_creator_create_create_seq_msg(env, rm_msg_ctx, \
rms_internal_sequence_id, acks_to, seq_prop_mgr);
if(!create_seq_rm_msg)
{
@@ -1817,7 +1835,7 @@
{
axis2_char_t *to_str = (axis2_char_t \
*)axis2_endpoint_ref_get_address(to_epr, env);
- to_epr_bean = sandesha2_seq_property_bean_create_with_data(env, \
internal_seq_id, + to_epr_bean = \
sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id, \
SANDESHA2_SEQ_PROP_TO_EPR, to_str);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, to_epr_bean);
@@ -1834,7 +1852,7 @@
seq_offer, env), env);
offer_seq_bean = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_name(offer_seq_bean, env, \
SANDESHA2_SEQ_PROP_OFFERED_SEQ);
- sandesha2_seq_property_bean_set_seq_id(offer_seq_bean, env, \
internal_seq_id); + sandesha2_seq_property_bean_set_seq_id(offer_seq_bean, \
env, rms_internal_sequence_id);
sandesha2_seq_property_bean_set_value(offer_seq_bean, env, seq_offer_id);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, offer_seq_bean);
}
@@ -1846,14 +1864,14 @@
}
axis2_msg_ctx_set_relates_to(create_seq_msg, env, NULL);
- str_key = axutil_uuid_gen(env);
- create_seq_bean = sandesha2_create_seq_bean_create_with_data(env, \
internal_seq_id, + create_sequence_msg_store_key = axutil_uuid_gen(env);
+ create_seq_bean = sandesha2_create_seq_bean_create_with_data(env, \
rms_internal_sequence_id,
(axis2_char_t*)axis2_msg_ctx_get_wsa_message_id(create_seq_msg, env), \
NULL);
- sandesha2_create_seq_bean_set_ref_msg_store_key(create_seq_bean, env, str_key);
+ 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);
- addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
+ addr_ns_uri = sandesha2_utils_get_seq_property(env, rms_internal_sequence_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, seq_prop_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
@@ -1891,7 +1909,7 @@
axis2_engine_free(engine, env);
}
- rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
internal_seq_id, + rms_sequence_bean = \
sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_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);
@@ -1916,7 +1934,7 @@
break;
}
- rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
internal_seq_id, + rms_sequence_bean = \
sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_internal_sequence_id, \
SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID); }
@@ -2166,8 +2184,7 @@
sandesha2_app_msg_processor_send_app_msg(
const axutil_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx,
- axis2_char_t *internal_seq_id,
- axis2_char_t *out_seq_id,
+ axis2_char_t *rms_internal_sequence_id,
long msg_num,
axis2_char_t *storage_key,
sandesha2_storage_mgr_t *storage_mgr,
@@ -2206,11 +2223,11 @@
axis2_bool_t resend = AXIS2_TRUE;
axis2_bool_t continue_sending = AXIS2_TRUE;
int msg_type = -1;
- axis2_char_t *incoming_seq_id = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[Sandesha2] sandesha2_app_msg_processor_send_app_msg");
- AXIS2_PARAM_CHECK(env->error, internal_seq_id, AXIS2_FAILURE);
+
+ AXIS2_PARAM_CHECK(env->error, rms_internal_sequence_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_key, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_prop_mgr, AXIS2_FAILURE);
@@ -2218,19 +2235,19 @@
app_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(app_msg_ctx, env);
- to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
internal_seq_id, + to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, \
env, rms_internal_sequence_id, SANDESHA2_SEQ_PROP_TO_EPR);
- reply_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
internal_seq_id, + reply_to_bean = \
sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_internal_sequence_id, \
SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
- rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
internal_seq_id,
- SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
+ rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
+ rms_internal_sequence_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
while(!rms_sequence_bean)
{
- rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
internal_seq_id,
- SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
+ rms_sequence_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
+ rms_internal_sequence_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID);
AXIS2_SLEEP(1);
}
@@ -2279,12 +2296,13 @@
sandesha2_msg_ctx_set_to(rm_msg_ctx, env, to_epr);
}
- rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, seq_prop_mgr);
+ rm_version = sandesha2_utils_get_rm_version(env, rms_internal_sequence_id, \
seq_prop_mgr); if(!rm_version)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]Unable to find RM spec version for the internal_seq_id \
%s",
- internal_seq_id);
+ "[sandesha2]Unable to find RM spec version for the rms \
internal_sequence_id %s", + rms_internal_sequence_id);
+
return AXIS2_FAILURE;
}
@@ -2370,14 +2388,16 @@
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
app_msg_entry = sandesha2_sender_bean_create(env);
- sandesha2_sender_bean_set_internal_seq_id(app_msg_entry, env, internal_seq_id);
+ sandesha2_sender_bean_set_internal_seq_id(app_msg_entry, env, \
rms_internal_sequence_id);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sandesha to_addr = %s ", to_addr);
+
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "rms_internal_sequence_id = %s ", \
rms_internal_sequence_id);
is_svr_side = axis2_msg_ctx_get_server_side(app_msg_ctx, env);
if(is_svr_side && sandesha2_utils_is_single_channel(env, rm_version, to_addr))
{
- axis2_char_t *incoming_seq_id = NULL;
+ axis2_char_t *rmd_sequence_id = NULL;
sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
axis2_msg_ctx_t *req_msg_ctx = NULL;
@@ -2405,9 +2425,9 @@
return AXIS2_FAILURE;
}
- incoming_seq_id = \
sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(req_seq, + \
rmd_sequence_id = sandesha2_identifier_get_identifier(sandesha2_seq_get_identifier(req_seq, \
env), env);
- if(!incoming_seq_id)
+ if(!rmd_sequence_id)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Sequence ID is \
NULL"); if(rm_version)
@@ -2422,7 +2442,7 @@
return AXIS2_FAILURE;
}
- sandesha2_msg_creator_add_ack_msg(env, rm_msg_ctx, incoming_seq_id, \
seq_prop_mgr); + sandesha2_msg_creator_add_ack_msg(env, rm_msg_ctx, \
rmd_sequence_id, seq_prop_mgr); if(req_rm_msg_ctx)
{
sandesha2_msg_ctx_free(req_rm_msg_ctx, env);
@@ -2452,7 +2472,7 @@
sandesha2_sender_bean_set_msg_type(app_msg_entry, env, \
SANDESHA2_MSG_TYPE_APPLICATION);
internal_seq_bean = sandesha2_seq_property_bean_create_with_data(env, msg_id,
- SANDESHA2_MSG_CTX_PROP_INTERNAL_SEQUENCE_ID, internal_seq_id);
+ SANDESHA2_MSG_CTX_PROP_INTERNAL_SEQUENCE_ID, rms_internal_sequence_id);
if(internal_seq_bean)
{
@@ -2527,8 +2547,6 @@
if(!sandesha2_util_is_ack_already_piggybacked(env, rm_msg_ctx))
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[Sandesha2] dam_int_seq_id2:%s", \
internal_seq_id);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[Sandesha2] dam_seq_id2:%s", \
incoming_seq_id);
sandesha2_ack_mgr_piggyback_acks_if_present(env, rm_msg_ctx, storage_mgr, \
seq_prop_mgr, sender_mgr);
}
@@ -2559,7 +2577,8 @@
sandesha2_sender_bean_t *sender_bean = NULL;
axis2_char_t *temp_msg_id = NULL;
- sender_bean = sandesha2_sender_mgr_get_next_msg_to_send(sender_mgr, env, \
internal_seq_id); + sender_bean = \
sandesha2_sender_mgr_get_next_msg_to_send(sender_mgr, env, + \
rms_internal_sequence_id); if(!sender_bean)
{
/* There is no pending message to send. So exit from the loop. */
@@ -2580,13 +2599,15 @@
}
status = sandesha2_app_msg_processor_resend(env, conf_ctx, msg_id, \
is_svr_side,
- internal_seq_id, storage_mgr, seq_prop_mgr, create_seq_mgr,
+ rms_internal_sequence_id, storage_mgr, seq_prop_mgr, create_seq_mgr, \
sender_mgr);
if(AXIS2_SUCCESS != status)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2] Resend failed for message id %s in sequence %s", \
msg_id, internal_seq_id); + "[sandesha2] Resend failed for message id \
%s in sequence %s", msg_id, + rms_internal_sequence_id);
+
resend = AXIS2_FALSE;
}
@@ -2607,7 +2628,7 @@
axis2_conf_ctx_t *conf_ctx,
axis2_char_t *msg_id,
axis2_bool_t is_svr_side,
- const axis2_char_t *internal_seq_id,
+ const axis2_char_t *rms_internal_sequence_id,
sandesha2_storage_mgr_t *storage_mgr,
sandesha2_seq_property_mgr_t *seq_prop_mgr,
sandesha2_create_seq_mgr_t *create_seq_mgr,
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_ \
removed-23may2008/src/msgprocessors/create_seq_msg_processor.c?rev=661995&r1=661994&r2=661995&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_msg_processor.c \
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_msg_processor.c \
Sat May 31 03:07:13 2008 @@ -177,79 +177,101 @@
axis2_char_t *dbname = NULL;
sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
- AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2] Start:sandesha2_create_seq_msg_processor_process_in_msg");
+ AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
+
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
create_seq_part = sandesha2_msg_ctx_get_create_seq(rm_msg_ctx, env);
if(!create_seq_part)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]create_seq_part"
- " is NULL");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING,
- AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] create_seq_part is \
NULL"); + AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING, \
AXIS2_FAILURE); return AXIS2_FAILURE;
}
+
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
dbname = sandesha2_util_get_dbname(env, conf_ctx);
seq_prop_mgr = sandesha2_permanent_seq_property_mgr_create(env, dbname);
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(env, dbname);
- fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_create_seq_refused(
- env, msg_ctx, seq_prop_mgr);
+ fault_rm_msg_ctx = sandesha2_fault_mgr_check_for_create_seq_refused(env, \
msg_ctx, seq_prop_mgr); if(fault_rm_msg_ctx)
{
axis2_engine_t *engine = NULL;
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[sandesha2]A fault occurred");
+
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] A fault occurred");
+
engine = axis2_engine_create(env, conf_ctx);
- axis2_engine_send_fault(engine, env, sandesha2_msg_ctx_get_msg_ctx(
- fault_rm_msg_ctx, env));
+ axis2_engine_send_fault(engine, env, \
sandesha2_msg_ctx_get_msg_ctx(fault_rm_msg_ctx, env)); if(fault_rm_msg_ctx)
+ {
sandesha2_msg_ctx_free(fault_rm_msg_ctx, env);
+ }
+
if(engine)
{
axis2_engine_free(engine, env);
engine = NULL;
}
+
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
+
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(next_msg_mgr)
+ {
sandesha2_next_msg_mgr_free(next_msg_mgr, env);
+ }
+
return AXIS2_SUCCESS;
}
+
out_msg_ctx = sandesha2_utils_create_out_msg_ctx(env, msg_ctx);
- rmd_sequence_id = sandesha2_seq_mgr_setup_new_rmd_sequence(env, rm_msg_ctx, \
seq_prop_mgr,
- next_msg_mgr);
+ rmd_sequence_id = sandesha2_seq_mgr_setup_new_rmd_sequence(env, rm_msg_ctx,
+ seq_prop_mgr, next_msg_mgr);
+
+ create_seq_res_msg = sandesha2_msg_creator_create_create_seq_res_msg(env, \
rm_msg_ctx, + out_msg_ctx, rmd_sequence_id, seq_prop_mgr);
- create_seq_res_msg = sandesha2_msg_creator_create_create_seq_res_msg(env,
- rm_msg_ctx, out_msg_ctx, rmd_sequence_id, seq_prop_mgr);
axis2_msg_ctx_set_flow(out_msg_ctx, env, AXIS2_OUT_FLOW);
+
if(!create_seq_res_msg)
{
if(seq_prop_mgr)
+ {
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
+ }
if(create_seq_mgr)
+ {
sandesha2_create_seq_mgr_free(create_seq_mgr, env);
+ }
if(next_msg_mgr)
+ {
sandesha2_next_msg_mgr_free(next_msg_mgr, env);
+ }
+
return AXIS2_FAILURE;
}
- property = axutil_property_create_with_args(env, 0, 0, 0,
- AXIS2_VALUE_TRUE);
+
+ property = axutil_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
+
/* For making sure that this won't be processed again */
- sandesha2_msg_ctx_set_property(create_seq_res_msg, env,
- SANDESHA2_APPLICATION_PROCESSING_DONE, property);
+ sandesha2_msg_ctx_set_property(create_seq_res_msg, env, \
SANDESHA2_APPLICATION_PROCESSING_DONE, + property);
create_seq_res_part = sandesha2_msg_ctx_get_create_seq_res(create_seq_res_msg, \
env);
- seq_offer = sandesha2_create_seq_get_seq_offer(create_seq_part,
- env);
+ seq_offer = sandesha2_create_seq_get_seq_offer(create_seq_part, env);
+
/* Offer processing */
if(seq_offer)
{
@@ -266,6 +288,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[sandesha2] Accept part has not genereated for a message with \
offer");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING, \
AXIS2_FAILURE); +
if(seq_prop_mgr)
{
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
@@ -338,12 +361,15 @@
sandesha2_msg_ctx_add_soap_envelope(create_seq_res_msg, env);
}
}
+
acks_to = sandesha2_address_get_epr(sandesha2_acks_to_get_address(
sandesha2_create_seq_get_acks_to(create_seq_part, env), env), env);
+
if(!acks_to || !axis2_endpoint_ref_get_address(acks_to, env))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]Acks to is null");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR, AXIS2_FAILURE);
+
if(seq_prop_mgr)
{
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
@@ -361,7 +387,8 @@
}
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env, \
rmd_sequence_id,
- SANDESHA2_SEQ_PROP_ACKS_TO_EPR, \
(axis2_char_t*)axis2_endpoint_ref_get_address(acks_to, env)); + \
SANDESHA2_SEQ_PROP_ACKS_TO_EPR, \
(axis2_char_t*)axis2_endpoint_ref_get_address(acks_to, + env));
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, acks_to_bean);
@@ -421,6 +448,7 @@
}
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
+
if(seq_prop_mgr)
{
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_ \
removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c?rev=661995&r1=661994&r2=661995&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c \
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/create_seq_res_msg_processor.c \
Sat May 31 03:07:13 2008 @@ -155,7 +155,7 @@
sandesha2_sender_mgr_t *sender_mgr = NULL;
sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
- axis2_char_t *rms_internal_seq_id = NULL;
+ axis2_char_t *rms_internal_sequence_id = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
sandesha2_seq_property_bean_t *rms_sequence_bean = NULL;
sandesha2_seq_property_bean_t *rms_internal_sequence_bean = NULL;
@@ -242,8 +242,8 @@
return AXIS2_FAILURE;
}
- rms_internal_seq_id = \
sandesha2_create_seq_bean_get_rms_internal_sequence_id(create_seq_bean, \
env);
- if(!rms_internal_seq_id)
+ rms_internal_sequence_id = \
sandesha2_create_seq_bean_get_rms_internal_sequence_id(create_seq_bean, env); + \
if(!rms_internal_sequence_id) {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Internal sequence id is \
not set");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID, \
AXIS2_FAILURE); @@ -271,11 +271,11 @@
sandesha2_create_seq_bean_set_rms_sequence_id(create_seq_bean, env, \
rms_sequence_id);
sandesha2_create_seq_mgr_update(create_seq_mgr, env, create_seq_bean);
- rms_sequence_bean = sandesha2_seq_property_bean_create_with_data(env, \
rms_internal_seq_id, + rms_sequence_bean = \
sandesha2_seq_property_bean_create_with_data(env, \
rms_internal_sequence_id,
SANDESHA2_SEQUENCE_PROPERTY_RMS_SEQ_ID, rms_sequence_id);
rms_internal_sequence_bean = sandesha2_seq_property_bean_create_with_data(env, \
rms_sequence_id,
- SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, rms_internal_seq_id);
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, \
rms_internal_sequence_id);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, rms_sequence_bean);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, \
rms_internal_sequence_bean); @@ -304,7 +304,7 @@
axis2_char_t *acks_to = NULL;
next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(env, dbname);
- offerd_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
rms_internal_seq_id, + offerd_seq_bean = \
sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_internal_sequence_id, \
SANDESHA2_SEQ_PROP_OFFERED_SEQ);
if(!offerd_seq_bean)
@@ -338,7 +338,7 @@
rmd_sequence_id = sandesha2_seq_property_bean_get_value(offerd_seq_bean, \
env);
special_int_seq_bean = sandesha2_seq_property_bean_create_with_data(env, \
rmd_sequence_id,
- SANDESHA2_SEQ_PROP_SPECIAL_INTERNAL_SEQ_ID, rms_internal_seq_id);
+ SANDESHA2_SEQ_PROP_SPECIAL_INTERNAL_SEQ_ID, \
rms_internal_sequence_id);
if(special_int_seq_bean)
{
@@ -363,14 +363,14 @@
next_bean = sandesha2_next_msg_bean_create(env);
sandesha2_next_msg_bean_set_seq_id(next_bean, env, rmd_sequence_id);
- sandesha2_next_msg_bean_set_internal_seq_id(next_bean, env, \
rms_internal_seq_id); + sandesha2_next_msg_bean_set_internal_seq_id(next_bean, \
env, rms_internal_sequence_id);
sandesha2_next_msg_bean_set_next_msg_no_to_process(next_bean, env, 1);
rm_spec_ver = sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env);
if(!axutil_strcmp(SANDESHA2_SPEC_VERSION_1_1, rm_spec_ver))
{
- axis2_char_t *reply_to_addr = sandesha2_utils_get_seq_property(env, \
rms_internal_seq_id, + axis2_char_t *reply_to_addr = \
sandesha2_utils_get_seq_property(env, rms_internal_sequence_id, \
SANDESHA2_SEQ_PROP_REPLY_TO_EPR, seq_prop_mgr); if(reply_to_addr)
{
@@ -384,7 +384,7 @@
acks_to = (axis2_char_t *) axis2_endpoint_ref_get_address(acks_to_epr, env);
create_seq_rm_msg = sandesha2_msg_creator_create_create_seq_msg(env, \
rm_msg_ctx,
- rms_internal_seq_id, acks_to, seq_prop_mgr);
+ rms_internal_sequence_id, acks_to, seq_prop_mgr);
if(!create_seq_rm_msg)
{
@@ -420,7 +420,7 @@
sandesha2_msg_ctx_set_flow(create_seq_rm_msg, env, \
SANDESHA2_MSG_CTX_OUT_FLOW);
create_seq_msg = sandesha2_msg_ctx_get_msg_ctx(create_seq_rm_msg, env);
- to_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, \
rms_internal_seq_id, + to_seq_bean = \
sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, rms_internal_sequence_id, \
SANDESHA2_SEQ_PROP_TO_EPR);
if(to_seq_bean)
@@ -482,7 +482,7 @@
/* If polling_mode is true, starting the polling manager */
if(polling_mode)
{
- sandesha2_utils_start_polling_mgr(env, conf_ctx, rms_internal_seq_id);
+ sandesha2_utils_start_polling_mgr(env, conf_ctx, \
rms_internal_sequence_id); }
sandesha2_next_msg_mgr_insert(next_msg_mgr, env, next_bean);
@@ -511,9 +511,9 @@
{
sandesha2_next_msg_mgr_free(next_msg_mgr, env);
}
- }
+ } /* End of if accept block */
- sandesha2_seq_mgr_update_last_activated_time(env, rms_internal_seq_id, \
seq_prop_mgr); + sandesha2_seq_mgr_update_last_activated_time(env, \
rms_internal_sequence_id, seq_prop_mgr); op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, \
env); axis2_op_ctx_set_response_written(op_ctx, env, AXIS2_TRUE);
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_ \
removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c?rev=661995&r1=661994&r2=661995&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c \
(original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/msgprocessors/terminate_seq_msg_processor.c \
Sat May 31 03:07:13 2008 @@ -168,7 +168,7 @@
{
axis2_msg_ctx_t *msg_ctx = NULL;
sandesha2_terminate_seq_t *term_seq = NULL;
- axis2_char_t *seq_id = NULL;
+ axis2_char_t *rmd_sequence_id = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
sandesha2_storage_mgr_t *storage_mgr = NULL;
sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL;
@@ -196,9 +196,9 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING, \
AXIS2_FAILURE); return AXIS2_FAILURE;
}
- seq_id = sandesha2_identifier_get_identifier(sandesha2_terminate_seq_get_identifier(
+ rmd_sequence_id = \
sandesha2_identifier_get_identifier(sandesha2_terminate_seq_get_identifier( \
term_seq, env), env);
- if(!seq_id || 0 == axutil_strlen(seq_id))
+ if(!rmd_sequence_id || 0 == axutil_strlen(rmd_sequence_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid sequence id");
return AXIS2_FAILURE;
@@ -211,7 +211,7 @@
create_seq_mgr = sandesha2_permanent_create_seq_mgr_create(env, dbname);
sender_mgr = sandesha2_permanent_sender_mgr_create(env, dbname);
next_msg_mgr = sandesha2_permanent_next_msg_mgr_create(env, dbname);
- fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env, rm_msg_ctx, seq_id, \
seq_prop_mgr, + fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env, \
rm_msg_ctx, rmd_sequence_id, seq_prop_mgr, create_seq_mgr, next_msg_mgr);
if(fault_ctx)
@@ -254,7 +254,7 @@
}
/*term_rcvd_bean = sandesha2_seq_property_bean_create(env);
- sandesha2_seq_property_bean_set_seq_id(term_rcvd_bean, env, seq_id);
+ sandesha2_seq_property_bean_set_seq_id(term_rcvd_bean, env, rmd_sequence_id);
sandesha2_seq_property_bean_set_name(term_rcvd_bean, env, \
SANDESHA2_SEQ_PROP_TERMINATE_RECEIVED);
sandesha2_seq_property_bean_set_value(term_rcvd_bean, env, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_rcvd_bean);*/
@@ -262,28 +262,28 @@
spec_version = sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env);
if(sandesha2_spec_specific_consts_is_term_seq_res_reqd(env, spec_version))
{
- sandesha2_terminate_seq_msg_processor_add_terminate_seq_res(env, rm_msg_ctx, \
seq_id, + sandesha2_terminate_seq_msg_processor_add_terminate_seq_res(env, \
rm_msg_ctx, rmd_sequence_id, seq_prop_mgr);
}
seq_ack = sandesha2_msg_ctx_get_seq_ack(rm_msg_ctx, env);
if(seq_ack)
{
- axis2_char_t *int_seq_id = NULL;
- axis2_char_t *out_seq_id = NULL;
+ axis2_char_t *rms_internal_sequence_id = NULL;
+ axis2_char_t *rms_sequence_id = NULL;
axis2_char_t *last_out_msg_no_str = NULL;
long highest_out_msg_no = 0;
/* If there is a sequence acknowledgement element present in the sequence we \
will check
* whether the sequence is completed. If so send a terminate sequence \
message.
*/
- out_seq_id = \
sandesha2_identifier_get_identifier(sandesha2_seq_ack_get_identifier(seq_ack, \
- env), env);
+ rms_sequence_id = \
sandesha2_identifier_get_identifier(sandesha2_seq_ack_get_identifier( + \
seq_ack, env), env);
- int_seq_id = sandesha2_utils_get_seq_property(env, out_seq_id,
+ rms_internal_sequence_id = sandesha2_utils_get_seq_property(env, \
rms_sequence_id,
SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, seq_prop_mgr);
- last_out_msg_no_str = sandesha2_utils_get_seq_property(env, int_seq_id,
+ last_out_msg_no_str = sandesha2_utils_get_seq_property(env, \
rms_internal_sequence_id, SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO, seq_prop_mgr);
if(last_out_msg_no_str)
@@ -296,8 +296,8 @@
}
else
{
- highest_out_msg_no = sandesha2_app_msg_processor_get_prev_msg_no(env, \
int_seq_id,
- seq_prop_mgr);
+ highest_out_msg_no = sandesha2_app_msg_processor_get_prev_msg_no(env,
+ rms_internal_sequence_id, seq_prop_mgr);
}
if(highest_out_msg_no > 0)
@@ -314,25 +314,25 @@
if(completed)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[sandesha2]Sequence %s is completed. So adding terminate \
msg", out_seq_id);
- sandesha2_terminate_mgr_add_terminate_seq_msg(env, rm_msg_ctx, \
out_seq_id,
- int_seq_id, storage_mgr, seq_prop_mgr, create_seq_mgr, \
sender_mgr); + "[sandesha2]Sequence %s is completed. So adding \
terminate msg", rms_sequence_id); + \
sandesha2_terminate_mgr_add_terminate_seq_msg(env, rm_msg_ctx, rms_sequence_id, + \
rms_internal_sequence_id, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr); }
}
}
else
{
sandesha2_terminate_seq_msg_processor_setup_highest_msg_nums(env, conf_ctx, \
storage_mgr,
- seq_id, rm_msg_ctx, seq_prop_mgr, create_seq_mgr, sender_mgr);
+ rmd_sequence_id, rm_msg_ctx, seq_prop_mgr, create_seq_mgr, \
sender_mgr); }
- sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx, \
seq_id, storage_mgr, + \
sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx, \
rmd_sequence_id, storage_mgr, seq_prop_mgr, next_msg_mgr);
- /*transmit_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
+ /*transmit_bean = sandesha2_seq_property_bean_create_with_data(env, \
rmd_sequence_id, SANDESHA2_SEQ_PROP_SEQ_TERMINATED, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, transmit_bean);
- sandesha2_seq_mgr_update_last_activated_time(env, seq_id, storage_mgr);
+ sandesha2_seq_mgr_update_last_activated_time(env, rmd_sequence_id, storage_mgr);
*/
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
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=661995&r1=661994&r2=661995&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 \
Sat May 31 03:07:13 2008 @@ -732,7 +732,6 @@
axis2_endpoint_ref_t *reply_to_epr = NULL;
axis2_bool_t is_svr_side = AXIS2_FALSE;
axis2_char_t *msg_id = NULL;
- long retrans_interval = -1;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2] Entry:sandesha2_terminate_mgr_add_terminate_seq_msg");
@@ -995,12 +994,15 @@
{
long retrans_delay = -1;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, \
"came1*************************");
retrans_delay = \
sandesha2_property_bean_get_retrans_interval(property_bean, env);
- AXIS2_SLEEP(retrans_interval);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, \
"retrans_delay:%ld*************************", retrans_delay); + \
AXIS2_SLEEP(retrans_delay);
status = sandesha2_terminate_mgr_resend(env, conf_ctx, msg_id, \
is_svr_side,
storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, \
"came2*************************"); if(AXIS2_SUCCESS != status)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic