Author: damitha
Date: Tue Sep 2 02:16:57 2008
New Revision: 691171
URL: http://svn.apache.org/viewvc?rev=691171&view=rev
Log:
Updating database cleaning code
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?rev=691171&r1=691170&r2=691171&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
Tue Sep 2 02:16:57 2008
@@ -500,28 +500,7 @@
if(bean1)
sandesha2_sender_bean_free(bean1, env);
}
- msg_type = sandesha2_msg_ctx_get_msg_type(return_rm_msg_ctx, env);
- if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ == msg_type)
- {
- sandesha2_terminate_seq_t *terminate_seq = NULL;
- axis2_char_t *seq_id = NULL;
- axis2_conf_ctx_t *conf_ctx = NULL;
- axis2_char_t *int_seq_id = NULL;
-
- terminate_seq = sandesha2_msg_ctx_get_terminate_seq(return_rm_msg_ctx,
- env);
- seq_id = sandesha2_identifier_get_identifier(
- sandesha2_terminate_seq_get_identifier(terminate_seq,
- env), env);
- conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- int_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
- SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, seq_prop_mgr);
- sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
- int_seq_id, axis2_msg_ctx_get_server_side(msg_ctx, env),
- storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
- if(int_seq_id)
- AXIS2_FREE(env->allocator, int_seq_id);
- }
+
if(seq_prop_mgr)
sandesha2_seq_property_mgr_free(seq_prop_mgr, env);
if(create_seq_mgr)
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?rev=691171&r1=691170&r2=691171&view=diff
==============================================================================
---
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 2 02:16:57 2008
@@ -704,7 +704,6 @@
axis2_op_t *old_op = NULL;
axis2_op_t *out_in_op = NULL;
axutil_qname_t *qname = NULL;
- /*axis2_op_ctx_t *op_ctx = NULL;*/
sandesha2_terminate_seq_t *term_seq_part = NULL;
axis2_char_t *rm_version = NULL;
axis2_char_t *transport_to = NULL;
@@ -782,13 +781,6 @@
axis2_op_set_msg_exchange_pattern(out_in_op, env, AXIS2_MEP_URI_OUT_IN);
axis2_op_set_in_flow(out_in_op, env, axis2_op_get_in_flow(old_op, env));
- /*axutil_allocator_switch_to_global_pool(env->allocator);
- op_ctx = axis2_op_ctx_create(env, out_in_op, NULL);
- axis2_op_ctx_set_parent(op_ctx, env, axis2_msg_ctx_get_svc_ctx(msg_ctx,
env));
- axis2_conf_ctx_register_op_ctx(conf_ctx, env, sandesha2_msg_ctx_get_msg_id(
- rm_msg_ctx, env), op_ctx);
- axutil_allocator_switch_to_local_pool(env->allocator);*/
-
if(terminated && !axutil_strcmp(terminated, AXIS2_VALUE_TRUE))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate was
added previously");
@@ -897,27 +889,6 @@
sandesha2_ack_mgr_piggyback_acks_if_present(env, out_seq_id,
rm_msg_ctx, storage_mgr,
seq_prop_mgr, sender_mgr);
}
-
- /*key = axutil_uuid_gen(env);
- term_bean = sandesha2_sender_bean_create(env);
- sandesha2_sender_bean_set_msg_ctx_ref_key(term_bean, env, key);
- sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, msg_ctx);
-
- // TODO: refine the terminate delay
- sandesha2_sender_bean_set_time_to_send(term_bean, env,
- sandesha2_utils_get_current_time_in_millis(env) +
- SANDESHA2_TERMINATE_DELAY);
- sandesha2_sender_bean_set_msg_id(term_bean, env,
- (axis2_char_t *) axis2_msg_ctx_get_msg_id(msg_ctx, env));
- sandesha2_sender_bean_set_send(term_bean, env, AXIS2_TRUE);
-
- property = axutil_property_create_with_args(env, 0, 0, 0,
- AXIS2_VALUE_TRUE);
- axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_QUALIFIED_FOR_SENDING,
- property, AXIS2_FALSE);
- sandesha2_sender_bean_set_resend(term_bean, env, AXIS2_FALSE);
- retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
- sandesha2_sender_mgr_insert(retrans_mgr, env, term_bean);*/
term_added = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_name(term_added, env,
SANDESHA2_SEQ_PROP_TERMINATE_ADDED);
@@ -929,9 +900,6 @@
sandesha2_seq_property_bean_set_value(term_added, env, AXIS2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_added);
- /*sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
int_seq_id,
- axis2_msg_ctx_get_server_side(msg_ctx, env), storage_mgr,
seq_prop_mgr, create_seq_mgr,
- sender_mgr);*/
if(seq_prop_mgr)
{
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c?rev=691171&r1=691170&r2=691171&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_res_msg_processor.c
Tue Sep 2 02:16:57 2008
@@ -135,6 +135,7 @@
sandesha2_create_seq_mgr_t *create_seq_mgr = NULL;
sandesha2_sender_mgr_t *sender_mgr = NULL;
axis2_char_t *dbname = NULL;
+ axis2_char_t *internal_seq_id = NULL;
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
@@ -171,6 +172,10 @@
SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, storage_mgr);*/
/*sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, seq_id,
AXIS2_FALSE, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);*/
+ internal_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
+ SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID, seq_prop_mgr);
+ sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
internal_seq_id,
+ AXIS2_FALSE, storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
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?rev=691171&r1=691170&r2=691171&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Tue Sep 2 02:16:57
2008
@@ -993,8 +993,8 @@
}
/* Clean sending side data */
- /*sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
internal_sequence_id,
- is_svr_side, storage_mgr, seq_prop_mgr, create_seq_mgr,
sender_mgr);*/
+ sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
internal_sequence_id,
+ is_svr_side, storage_mgr, seq_prop_mgr, create_seq_mgr,
sender_mgr);
terminate_added = sandesha2_seq_property_bean_create(env);
if(terminate_added)
@@ -1212,8 +1212,8 @@
sandesha2_sender_bean_free(terminate_sender_bean, env);
}
- /*sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
internal_sequence_id, is_svr_side,
- storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);*/
+ sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
internal_sequence_id, is_svr_side,
+ storage_mgr, seq_prop_mgr, create_seq_mgr, sender_mgr);
terminate_added = sandesha2_seq_property_bean_create(env);
if(terminate_added)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
