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/11 07:11:23 UTC
svn commit: r666527 [2/2] - in
/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008: ./
include/ samples/ samples/rm_ping_1_0/ src/client/ src/core/ src/handlers/
src/msgprocessors/ src/storage/beans/ src/storage/common/ src/storage/s...
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/common/sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/common/sender_mgr.c?rev=666527&r1=666526&r2=666527&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/common/sender_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/common/sender_mgr.c Tue Jun 10 22:11:22 2008
@@ -96,6 +96,16 @@
}
sandesha2_sender_bean_t *AXIS2_CALL
+sandesha2_sender_mgr_get_next_application_msg_to_send(
+ sandesha2_sender_mgr_t *sender,
+ const axutil_env_t *env,
+ const axis2_char_t *seq_id,
+ const axis2_char_t *msg_id)
+{
+ return sender->ops.get_next_application_msg_to_send(sender, env, seq_id, msg_id);
+}
+
+sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_sender_mgr_get_next_msg_to_send(
sandesha2_sender_mgr_t *sender,
const axutil_env_t *env,
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_bean_mgr.c?rev=666527&r1=666526&r2=666527&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_bean_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_bean_mgr.c Tue Jun 10 22:11:22 2008
@@ -206,8 +206,7 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert");
+
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -227,8 +226,7 @@
return AXIS2_FALSE;
}
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_insert");
+
return AXIS2_TRUE;
}
@@ -275,8 +273,7 @@
void *bean = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_retrieve");
+
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -307,8 +304,7 @@
if(args)
AXIS2_FREE(env->allocator, args);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_retrieve");
+
return bean;
}
@@ -321,8 +317,7 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_update");
+
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -342,8 +337,7 @@
return AXIS2_FALSE;
}
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_update");
+
return AXIS2_TRUE;
}
@@ -405,8 +399,7 @@
int rc = -1;
sqlite3 *dbconn = NULL;
axis2_char_t sql_stmt_retrieve[512];
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_retrieve_msg_store_bean");
+
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -440,8 +433,7 @@
if(args)
AXIS2_FREE(env->allocator, args);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_retrieve_msg_store_bean");
+
return msg_store_bean;
}
@@ -476,8 +468,6 @@
axis2_char_t *action = NULL;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_update_msg_store_bean");
msg_id = sandesha2_msg_store_bean_get_msg_id(bean, env);
stored_key = sandesha2_msg_store_bean_get_stored_key(bean, env);
soap_env_str = sandesha2_msg_store_bean_get_soap_envelope_str(bean, env);
@@ -537,8 +527,7 @@
}
AXIS2_FREE(env->allocator, sql_stmt_update);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_update_msg_store_bean");
+
return AXIS2_TRUE;
}
@@ -573,8 +562,6 @@
axis2_char_t *action = NULL;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
msg_id = sandesha2_msg_store_bean_get_msg_id(bean, env);
stored_key = sandesha2_msg_store_bean_get_stored_key(bean, env);
soap_env_str = sandesha2_msg_store_bean_get_soap_envelope_str(bean, env);
@@ -633,8 +620,7 @@
}
AXIS2_FREE(env->allocator, sql_stmt_insert);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
+
return AXIS2_TRUE;
}
@@ -648,8 +634,7 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
+
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
if(!dbconn)
{
@@ -670,8 +655,7 @@
return AXIS2_FALSE;
}
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
+
return AXIS2_TRUE;
}
@@ -690,8 +674,6 @@
int sql_size = -1;
sqlite3 *dbconn = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_bean_mgr_store_response");
sql_size = axutil_strlen(seq_id) + axutil_strlen(response) +
sizeof(int) + sizeof(int) + 512;
dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
@@ -718,8 +700,7 @@
}
AXIS2_FREE(env->allocator, sql_stmt_insert);
sqlite3_close(dbconn);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_bean_mgr_store_response");
+
return AXIS2_TRUE;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_create_seq_mgr.c?rev=666527&r1=666526&r2=666527&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_create_seq_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_create_seq_mgr.c Tue Jun 10 22:11:22 2008
@@ -69,7 +69,7 @@
sandesha2_create_seq_bean_set_create_seq_msg_id(bean, env, argv[i]);
if(0 == axutil_strcmp(col_name[i], "internal_seq_id"))
if(argv[i])
- sandesha2_create_seq_bean_set_rms_internal_sequence_id(bean, env, argv[i]);
+ sandesha2_create_seq_bean_set_internal_sequence_id(bean, env, argv[i]);
if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_rms_sequence_id(bean, env, argv[i]);
@@ -114,7 +114,7 @@
{
if(argv[i])
{
- sandesha2_create_seq_bean_set_rms_internal_sequence_id(bean, env, argv[i]);
+ sandesha2_create_seq_bean_set_internal_sequence_id(bean, env, argv[i]);
}
}
if(0 == axutil_strcmp(col_name[i], "seq_id"))
@@ -233,12 +233,10 @@
axis2_char_t *create_seq_msg_store_key = NULL;
axis2_char_t *ref_msg_store_key = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_create_seq_mgr_insert");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
bean, env);
- internal_seq_id = sandesha2_create_seq_bean_get_rms_internal_sequence_id(bean, env);
+ internal_seq_id = sandesha2_create_seq_bean_get_internal_sequence_id(bean, env);
seq_id = sandesha2_create_seq_bean_get_rms_sequence_id(bean, env);
create_seq_msg_store_key = sandesha2_create_seq_bean_get_create_seq_msg_store_key(bean, env);
ref_msg_store_key = sandesha2_create_seq_bean_get_ref_msg_store_key(bean, env);
@@ -252,8 +250,7 @@
ret = sandesha2_permanent_bean_mgr_insert(seq_mgr_impl->bean_mgr, env,
sql_insert);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_create_seq_mgr_insert");
+
return ret;
}
@@ -287,16 +284,14 @@
{
axis2_char_t sql_retrieve[256];
sandesha2_permanent_create_seq_mgr_t *seq_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_create_seq_mgr_retrieve");
+
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
sprintf(sql_retrieve, "select create_seq_msg_id, internal_seq_id,"\
"seq_id, create_seq_msg_store_key, ref_msg_store_key from create_seq "\
"where create_seq_msg_id='%s';", msg_id);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_create_seq_mgr_retrieve");
+
return (sandesha2_create_seq_bean_t *) sandesha2_permanent_bean_mgr_retrieve(
seq_mgr_impl->bean_mgr, env, sandesha2_create_seq_retrieve_callback,
sql_retrieve);
@@ -316,12 +311,11 @@
axis2_char_t *create_seq_msg_store_key = NULL;
axis2_char_t *seq_id = NULL;
axis2_char_t *ref_msg_store_key = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "Entry:[sandesha2]sandesha2_permanent_create_seq_mgr_update");
+
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
bean, env);
- internal_seq_id = sandesha2_create_seq_bean_get_rms_internal_sequence_id(bean, env);
+ internal_seq_id = sandesha2_create_seq_bean_get_internal_sequence_id(bean, env);
seq_id = sandesha2_create_seq_bean_get_rms_sequence_id(bean, env);
create_seq_msg_store_key = sandesha2_create_seq_bean_get_create_seq_msg_store_key(bean, env);
ref_msg_store_key = sandesha2_create_seq_bean_get_ref_msg_store_key(bean, env);
@@ -332,11 +326,8 @@
",create_seq_msg_store_key='%s', ref_msg_store_key='%s' where "\
"create_seq_msg_id='%s';", internal_seq_id, seq_id,
create_seq_msg_store_key, ref_msg_store_key, create_seq_msg_id);
- ret = sandesha2_permanent_bean_mgr_update(seq_mgr_impl->bean_mgr, env,
- sql_update);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "Exit:[sandesha2]sandesha2_permanent_create_seq_mgr_update:return:%d",
- ret);
+ ret = sandesha2_permanent_bean_mgr_update(seq_mgr_impl->bean_mgr, env, sql_update);
+
return ret;
}
@@ -353,14 +344,13 @@
axis2_char_t *seq_id = NULL;
axutil_array_list_t *find_list = NULL;
sandesha2_permanent_create_seq_mgr_t *seq_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "Entry:[sandesha2]sandesha2_permanent_create_seq_mgr_find");
+
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
if(bean)
{
create_seq_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
bean, env);
- internal_seq_id = sandesha2_create_seq_bean_get_rms_internal_sequence_id(bean, env);
+ internal_seq_id = sandesha2_create_seq_bean_get_internal_sequence_id(bean, env);
seq_id = sandesha2_create_seq_bean_get_rms_sequence_id(bean, env);
}
sprintf(sql_find, "select create_seq_msg_id,internal_seq_id,"\
@@ -399,8 +389,6 @@
find_list = sandesha2_permanent_bean_mgr_find(seq_mgr_impl->bean_mgr, env,
sandesha2_create_seq_find_callback, sql_find);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "Exit:[sandesha2]sandesha2_permanent_create_seq_mgr_find");
return find_list;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c?rev=666527&r1=666526&r2=666527&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/permanent_sender_mgr.c Tue Jun 10 22:11:22 2008
@@ -203,6 +203,13 @@
sandesha2_sender_bean_t *bean);
sandesha2_sender_bean_t *AXIS2_CALL
+sandesha2_permanent_sender_mgr_get_next_application_msg_to_send(
+ sandesha2_sender_mgr_t *sender_mgr,
+ const axutil_env_t *env,
+ const axis2_char_t *seq_id,
+ const axis2_char_t *msg_id);
+
+sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_permanent_sender_mgr_get_next_msg_to_send(
sandesha2_sender_mgr_t *sender_mgr,
const axutil_env_t *env,
@@ -218,6 +225,7 @@
sandesha2_permanent_sender_mgr_find_by_internal_seq_id,
sandesha2_permanent_sender_mgr_find_by_sender_bean,
sandesha2_permanent_sender_mgr_find_unique,
+ sandesha2_permanent_sender_mgr_get_next_application_msg_to_send,
sandesha2_permanent_sender_mgr_get_next_msg_to_send,
};
@@ -279,12 +287,9 @@
axis2_char_t *wsrm_anon_uri = NULL;
axis2_char_t *to_address = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_insert");
-
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- msg_id = sandesha2_sender_bean_get_msg_id(bean,
- env);
+
+ msg_id = sandesha2_sender_bean_get_msg_id(bean, env);
msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
sent_count = sandesha2_sender_bean_get_sent_count(bean, env);
@@ -306,10 +311,8 @@
internal_seq_id, sent_count, msg_no, send, resend, time_to_send,
msg_type, seq_id, wsrm_anon_uri, to_address);
- ret = sandesha2_permanent_bean_mgr_insert(sender_mgr_impl->bean_mgr, env,
- sql_insert);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_insert");
+ ret = sandesha2_permanent_bean_mgr_insert(sender_mgr_impl->bean_mgr, env, sql_insert);
+
return ret;
}
@@ -345,8 +348,6 @@
sandesha2_sender_bean_t *ret = NULL;
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_retrieve");
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
@@ -358,8 +359,6 @@
sender_mgr_impl->bean_mgr, env, sandesha2_sender_retrieve_callback,
sql_retrieve);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_retrieve");
return ret;
}
@@ -385,11 +384,9 @@
axis2_char_t *wsrm_anon_uri = NULL;
axis2_char_t *to_address = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_update");
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
- msg_id = sandesha2_sender_bean_get_msg_id(bean,
- env);
+
+ msg_id = sandesha2_sender_bean_get_msg_id(bean, env);
msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(bean, env);
internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(bean, env);
sent_count= sandesha2_sender_bean_get_sent_count(bean, env);
@@ -414,8 +411,6 @@
ret = sandesha2_permanent_bean_mgr_update(sender_mgr_impl->bean_mgr, env,
sql_update);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_update");
return ret;
return AXIS2_SUCCESS;
@@ -430,18 +425,17 @@
axutil_array_list_t *find_list = NULL;
axis2_char_t sql_find[1054];
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_find_by_internal_seq_id");
+
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
sprintf(sql_find, "select msg_id, msg_ctx_ref_key, internal_seq_id, "\
"sent_count, msg_no, send, resend, time_to_send, msg_type, seq_id, "\
"wsrm_anon_uri, to_address from sender where internal_seq_id='%s';",
internal_seq_id);
+
find_list = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env,
sandesha2_sender_find_callback, sql_find);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_find_by_internal_seq_id");
+
return find_list;
}
@@ -462,9 +456,9 @@
axutil_array_list_t *find_list = NULL;
axis2_char_t sql_find[1024];
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Entry:sandesha2_permanent_sender_mgr_find_by_sender_bean");
+
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
+
if(bean)
{
msg_id = sandesha2_sender_bean_get_msg_id(bean,
@@ -562,8 +556,7 @@
sprintf(sql_find + axutil_strlen(sql_find), ";");
find_list = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env,
sandesha2_sender_find_callback, sql_find);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2]Exit:sandesha2_permanent_sender_mgr_find_by_sender_bean");
+
return find_list;
}
@@ -590,6 +583,100 @@
}
sandesha2_sender_bean_t *AXIS2_CALL
+sandesha2_permanent_sender_mgr_get_next_application_msg_to_send(
+ sandesha2_sender_mgr_t *sender_mgr,
+ const axutil_env_t *env,
+ const axis2_char_t *seq_id,
+ const axis2_char_t *msg_id)
+{
+ int i = 0;
+ int index = 0;
+ int match_list_size = 0;
+ axutil_array_list_t *match_list = NULL;
+ axis2_char_t sql_find[1024];
+ long time_now = 0;
+ sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
+ sandesha2_sender_bean_t *result = NULL;
+
+ sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
+
+ sprintf(sql_find, "select msg_id, msg_ctx_ref_key, "\
+ "internal_seq_id, sent_count, msg_no, send, resend, "\
+ "time_to_send, msg_type, seq_id, wsrm_anon_uri, "\
+ "to_address from sender where ");
+
+ time_now = sandesha2_utils_get_current_time_in_millis(env);
+ if(time_now > 0)
+ {
+ sprintf(sql_find + axutil_strlen(sql_find), "time_to_send <= %ld ", time_now);
+ }
+
+ if(seq_id)
+ {
+ sprintf(sql_find + axutil_strlen(sql_find), "and internal_seq_id='%s'", seq_id);
+ }
+
+ if(msg_id)
+ {
+ sprintf(sql_find + axutil_strlen(sql_find), "and msg_id='%s'", msg_id);
+ }
+
+ sprintf(sql_find + axutil_strlen(sql_find), "and msg_type='%d'", SANDESHA2_MSG_TYPE_APPLICATION);
+
+ sprintf(sql_find + axutil_strlen(sql_find), " and send=%d", AXIS2_TRUE);
+
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_find:%s", sql_find);
+
+ match_list = sandesha2_permanent_bean_mgr_find(sender_mgr_impl->bean_mgr, env,
+ sandesha2_sender_find_callback, sql_find);
+ match_list_size = axutil_array_list_size(match_list, env);
+
+ /*
+ * We carry on through the application message list to be sure that we send the lowest application
+ * message avaliable.
+ */
+ for(i = 0; i < match_list_size; i++)
+ {
+ sandesha2_sender_bean_t *bean = NULL;
+ long result_msg_no = -1;
+ long msg_no = -1;
+
+ bean = (sandesha2_sender_bean_t *) axutil_array_list_get(match_list, env, i);
+
+ msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
+
+ if(result)
+ {
+ result_msg_no = sandesha2_sender_bean_get_msg_no(result, env);
+ }
+
+ if(!result || result_msg_no > msg_no)
+ {
+ result = bean;
+ index = i;
+ }
+ }
+
+ result = axutil_array_list_remove(match_list, env, index);
+ if(match_list)
+ {
+ int j = 0, sizej = 0;
+
+ sizej = axutil_array_list_size(match_list, env);
+ for(j = 0; j < sizej; j++)
+ {
+ sandesha2_sender_bean_t *temp_bean = NULL;
+ temp_bean = axutil_array_list_get(match_list, env, j);
+ sandesha2_sender_bean_free(temp_bean, env);
+ }
+
+ axutil_array_list_free(match_list, env);
+ }
+
+ return result;
+}
+
+sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_permanent_sender_mgr_get_next_msg_to_send(
sandesha2_sender_mgr_t *sender_mgr,
const axutil_env_t *env,
@@ -605,8 +692,6 @@
sandesha2_sender_bean_t *result = NULL;
axis2_bool_t send_make_connection = AXIS2_TRUE;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Entry:sandesha2_permanent_sender_mgr_get_next_msg_to_send");
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
@@ -649,23 +734,11 @@
bean = (sandesha2_sender_bean_t *) axutil_array_list_get(match_list, env, i);
msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2]msg_type:%d", msg_type);
- if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
+ if(msg_type == SANDESHA2_MSG_TYPE_ACK)
{
- long msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
- long result_msg_no = -1;
-
- if(result)
- {
- result_msg_no = sandesha2_sender_bean_get_msg_no(result, env);
- }
-
- if(result == NULL || result_msg_no > msg_no)
- {
- result = bean;
- index = i;
- send_make_connection = AXIS2_FALSE;
- }
+ continue;
}
+
else if(msg_type == SANDESHA2_MSG_TYPE_MAKE_CONNECTION_MSG)
{
if(send_make_connection)
@@ -699,9 +772,6 @@
axutil_array_list_free(match_list, env);
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
- "[sandesha2] Exit:sandesha2_permanent_sender_mgr_get_next_msg_to_send");
-
return result;
}
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=666527&r1=666526&r2=666527&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 Tue Jun 10 22:11:22 2008
@@ -495,6 +495,7 @@
return NULL;
}
}
+
op_name_str = sandesha2_msg_store_bean_get_op(msg_store_bean, env);
op_mep_str = sandesha2_msg_store_bean_get_op_mep(msg_store_bean, env);
svc = axis2_msg_ctx_get_svc(msg_ctx, env);
@@ -536,12 +537,12 @@
axis2_msg_ctx_set_op(msg_ctx, env, op);
else
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Cant find a suitable "\
- "operation for the generated message");
- AXIS2_ERROR_SET(env->error,
+ AXIS2_LOG_WARNING(env->log, AXIS2_LOG_SI,
+ "[sandesha2] Cannot find a suitable operation for the generated message");
+ /*AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_CANNOT_FIND_OP_FOR_GENERATED_MSG, AXIS2_FAILURE);
axiom_soap_builder_free(soap_builder, env);
- return NULL;
+ return NULL;*/
}
}
/* Setting contexts TODO is this necessary? */
@@ -1062,8 +1063,10 @@
axis2_char_t *sql_stmt6 = NULL;
axis2_char_t *sql_stmt7 = NULL;
axis2_char_t *error_msg = NULL;
+
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_storage_mgr_create_db");
+
dbname = sandesha2_util_get_dbname(env, conf_ctx);
if(AXIS2_SUCCESS == axutil_file_handler_access(dbname, AXIS2_F_OK))
{
@@ -1193,6 +1196,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Database %s creation failed", dbname);
return AXIS2_FAILURE;
}
+
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_storage_mgr_create_db");
return AXIS2_SUCCESS;
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c?rev=666527&r1=666526&r2=666527&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/ack_mgr.c Tue Jun 10 22:11:22 2008
@@ -45,9 +45,8 @@
{
axis2_msg_ctx_t *ref_msg = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
- sandesha2_seq_property_bean_t *acks_to_bean = NULL;
- axis2_endpoint_ref_t *acks_to = NULL;
- axis2_char_t *acks_to_str = NULL;
+
+ axis2_endpoint_ref_t *to = NULL;
axis2_op_t *ack_op = NULL;
axis2_op_t *ref_op = NULL;
axis2_msg_ctx_t *ack_msg_ctx = NULL;
@@ -61,23 +60,23 @@
ref_msg = sandesha2_msg_ctx_get_msg_ctx(ref_rm_msg, env);
conf_ctx = axis2_msg_ctx_get_conf_ctx(ref_msg, env);
- acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
- if(acks_to_bean)
- {
- acks_to = axis2_endpoint_ref_create(env,
- sandesha2_seq_property_bean_get_value(acks_to_bean,
- env));
- sandesha2_seq_property_bean_free(acks_to_bean, env);
- }
- if(acks_to)
- acks_to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(acks_to, env);
- if(!acks_to_str)
+
+ to = axis2_msg_ctx_get_reply_to(ref_msg, env);
+ if(!to)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid epr");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR, AXIS2_FAILURE);
- return NULL;
+ sandesha2_seq_property_bean_t *acks_to_bean = NULL;
+ axis2_char_t *acks_to_str = NULL;
+
+ acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
+ seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
+ if(acks_to_bean)
+ {
+ acks_to_str = sandesha2_seq_property_bean_get_value(acks_to_bean, env);
+ to = axis2_endpoint_ref_create(env, acks_to_str);
+ sandesha2_seq_property_bean_free(acks_to_bean, env);
+ }
}
+
ack_op = axis2_op_create(env);
axis2_op_set_msg_exchange_pattern(ack_op, env, AXIS2_MEP_URI_OUT_ONLY);
ref_op = axis2_msg_ctx_get_op(ref_msg, env);
@@ -114,7 +113,8 @@
sandesha2_utils_get_soap_version(env,
axis2_msg_ctx_get_soap_envelope(ref_msg, env)));
axis2_msg_ctx_set_soap_envelope(ack_msg_ctx, env, soap_env);
- axis2_msg_ctx_set_to(ack_msg_ctx, env, acks_to);
+ axis2_msg_ctx_set_to(ack_msg_ctx, env, to);
+
/* Adding the sequence acknowledgement part */
sandesha2_msg_creator_add_ack_msg(env, ack_rm_msg, seq_id, seq_prop_mgr);
axis2_msg_ctx_set_property(ack_msg_ctx, env, AXIS2_TRANSPORT_IN, NULL);
@@ -138,7 +138,7 @@
/**
* This is used to get the acked messages of a sequence. If this is an outgoing
- * message the sequence_identifier should be the internal sequenceID.
+ * message the sequence_identifier should be the outgoing sequenceID.
*
* @param sequence_identifier
* @param out_going_msg
@@ -147,7 +147,7 @@
AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
sandesha2_ack_mgr_get_client_completed_msgs_list(
const axutil_env_t *env,
- axis2_char_t *seq_id,
+ axis2_char_t *rms_seq_id,
sandesha2_seq_property_mgr_t *seq_prop_mgr)
{
sandesha2_seq_property_bean_t *internal_seq_bean = NULL;
@@ -157,7 +157,7 @@
/* First trying to get it from the internal sequence id.*/
internal_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
- seq_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
+ rms_seq_id, SANDESHA2_SEQUENCE_PROPERTY_RMS_INTERNAL_SEQ_ID);
if(internal_seq_bean != NULL)
{
internal_seq_id = sandesha2_seq_property_bean_get_value(
@@ -172,7 +172,7 @@
if(completed_msgs_bean == NULL)
{
completed_msgs_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
- env, seq_id,
+ env, rms_seq_id,
SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES);
}
if(completed_msgs_bean != NULL)
@@ -195,14 +195,14 @@
AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
sandesha2_ack_mgr_get_svr_completed_msgs_list(
const axutil_env_t *env,
- axis2_char_t *seq_id,
+ axis2_char_t *rmd_seq_id,
sandesha2_seq_property_mgr_t *seq_prop_mgr)
{
sandesha2_seq_property_bean_t *completed_msgs_bean = NULL;
axutil_array_list_t *completed_msg_list = NULL;
completed_msgs_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
- env, seq_id,
+ env, rmd_seq_id,
SANDESHA2_SEQ_PROP_SERVER_COMPLETED_MESSAGES);
if(completed_msgs_bean)
{
@@ -249,21 +249,28 @@
sandesha2_ack_range_t *ack_range = NULL;
sprintf(tmp, "%ld", start);
ack_range = axutil_hash_get(hash, tmp, AXIS2_HASH_KEY_STRING);
+ long upper_value = -1;
if(!ack_range)
{
break;
}
- if(sandesha2_ack_range_get_upper_value(ack_range, env) >= last_msg_no)
+ upper_value = sandesha2_ack_range_get_upper_value(ack_range, env);
+ if(upper_value >= last_msg_no)
{
if(hash)
+ {
axutil_hash_free(hash, env);
+ }
return AXIS2_TRUE;
}
start = sandesha2_ack_range_get_upper_value(ack_range, env) + 1;
}
+
if(hash)
+ {
axutil_hash_free(hash, env);
+ }
return AXIS2_FALSE;
}
@@ -280,7 +287,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_endpoint_ref_t *to_epr = NULL;
axutil_array_list_t *found_list = NULL;
int i = 0;
@@ -295,14 +302,18 @@
sandesha2_sender_bean_set_send(find_bean, env, AXIS2_TRUE);
sandesha2_sender_bean_set_resend(find_bean, env, AXIS2_FALSE);
- to = sandesha2_msg_ctx_get_to(rm_msg_ctx, env);
- if(to)
- to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(to, env);
+ to_epr = sandesha2_msg_ctx_get_to(rm_msg_ctx, env);
+ if(to_epr)
+ {
+ to_str = (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr, env);
+ }
- found_list = sandesha2_sender_mgr_find_by_sender_bean(sender_mgr, env,
- find_bean);
+ found_list = sandesha2_sender_mgr_find_by_sender_bean(sender_mgr, env, find_bean);
if(find_bean)
+ {
sandesha2_sender_bean_free(find_bean, env);
+ }
+
for(i = 0; i < axutil_array_list_size(found_list, env); i++)
{
sandesha2_sender_bean_t *sender_bean = NULL;
@@ -311,7 +322,7 @@
timenow = sandesha2_utils_get_current_time_in_millis(env);
sender_bean = axutil_array_list_get(found_list, env, i);
- /*if(sandesha2_sender_bean_get_time_to_send(sender_bean, env) > timenow)*/
+ if(sandesha2_sender_bean_get_time_to_send(sender_bean, env) <= timenow)
{
axis2_msg_ctx_t *msg_ctx1 = NULL;
axis2_char_t *to = NULL;
@@ -320,36 +331,49 @@
axis2_char_t *msg_ctx_ref_key = NULL;
axis2_endpoint_ref_t *to_ref = NULL;
- msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
- sender_bean, env);
- msg_ctx1 = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
- msg_ctx_ref_key, conf_ctx, AXIS2_FALSE);
- to_ref = axis2_msg_ctx_get_to(msg_ctx1, env);
+ msg_ctx_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(sender_bean, env);
+ msg_ctx1 = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env, msg_ctx_ref_key,
+ conf_ctx, AXIS2_FALSE);
+
+ if(msg_ctx1)
+ {
+ to_ref = axis2_msg_ctx_get_to(msg_ctx1, env);
+ }
+
if(to_ref)
+ {
to = (axis2_char_t*)axis2_endpoint_ref_get_address(to_ref, env);
+ }
else
+ {
continue;
+ }
+
if(axutil_strcmp(to, to_str))
+ {
continue;
+ }
+
sandesha2_sender_mgr_remove(sender_mgr, env,
sandesha2_sender_bean_get_msg_id(sender_bean, env));
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
msg_ctx_ref_key, conf_ctx, -1);
ack_rm_msg = sandesha2_msg_init_init_msg(env, msg_ctx1);
- if(SANDESHA2_MSG_TYPE_ACK != sandesha2_msg_ctx_get_msg_type(ack_rm_msg,
- env))
+
+ 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"
- " ack message entry");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid ack message entry");
return AXIS2_FAILURE;
}
seq_ack = sandesha2_msg_ctx_get_seq_ack(ack_rm_msg, env);
sandesha2_msg_ctx_set_seq_ack(rm_msg_ctx, env, seq_ack);
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
+
break;
}
}
+
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c?rev=666527&r1=666526&r2=666527&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/msg_creator.c Tue Jun 10 22:11:22 2008
@@ -194,7 +194,7 @@
{
axis2_endpoint_ref_t *reply_to_epr = NULL;
- reply_to_epr = axis2_endpoint_ref_create(env, axis2_endpoint_ref_get_address(temp_to, env));
+ reply_to_epr = axis2_endpoint_ref_create(env, axis2_endpoint_ref_get_address(temp_reply_to, env));
axis2_msg_ctx_set_reply_to(create_seq_msg_ctx, env, reply_to_epr);
}
create_seq_rm_msg = sandesha2_msg_ctx_create(env, create_seq_msg_ctx);
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c?rev=666527&r1=666526&r2=666527&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/sandesha2_utils.c Tue Jun 10 22:11:22 2008
@@ -30,6 +30,7 @@
#include <sandesha2_permanent_storage_mgr.h>
#include <axutil_string.h>
#include <axis2_conf.h>
+#include <axis2_const.h>
#include <axutil_property.h>
#include <axutil_uuid_gen.h>
#include <axiom_soap_body.h>
@@ -399,7 +400,7 @@
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_rms_internal_sequence_id(
+sandesha2_utils_get_internal_sequence_id(
const axutil_env_t *env,
axis2_char_t *rmd_sequence_id)
{
@@ -475,7 +476,7 @@
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-sandesha2_utils_get_client_rms_internal_sequence_id(
+sandesha2_utils_get_client_internal_sequence_id(
const axutil_env_t *env,
axis2_char_t *to,
axis2_char_t *seq_key)
@@ -1201,14 +1202,17 @@
}
axis2_bool_t AXIS2_CALL
-sandesha2_utils_is_single_channel(
+sandesha2_utils_is_rm_1_0_anonymous_acks_to(
const axutil_env_t *env,
const axis2_char_t *rm_version,
const axis2_char_t *acks_to_addr)
{
if(sandesha2_utils_is_anon_uri(env, acks_to_addr) &&
- (0 == axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, rm_version)))
+ (!axutil_strcmp(SANDESHA2_SPEC_VERSION_1_0, rm_version)))
+ {
return AXIS2_TRUE;
+ }
+
else return AXIS2_FALSE;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/seq_mgr.c?rev=666527&r1=666526&r2=666527&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/seq_mgr.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/util/seq_mgr.c Tue Jun 10 22:11:22 2008
@@ -76,7 +76,7 @@
axis2_char_t *spec_version = NULL;
axis2_char_t *address = NULL;
axis2_char_t *reply_to_addr = NULL;
- axis2_char_t *rms_internal_sequence_id = NULL;
+ axis2_char_t *internal_sequence_id = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[sandesha2]Entry:sandesha2_seq_mgr_setup_new_rmd_sequence");
@@ -151,8 +151,8 @@
next_msg_bean = sandesha2_next_msg_bean_create_with_data(env, rmd_sequence_id, 1);
/* 1 will be the next */
- rms_internal_sequence_id = sandesha2_utils_get_rms_internal_sequence_id(env, rmd_sequence_id);
- sandesha2_next_msg_bean_set_internal_seq_id(next_msg_bean, env, rms_internal_sequence_id);
+ internal_sequence_id = sandesha2_utils_get_internal_sequence_id(env, rmd_sequence_id);
+ sandesha2_next_msg_bean_set_internal_seq_id(next_msg_bean, env, internal_sequence_id);
sandesha2_next_msg_mgr_insert(next_msg_mgr, env, next_msg_bean);
/* Message to invoke. This will apply for only in-order invocations */
@@ -327,7 +327,7 @@
sandesha2_seq_mgr_setup_new_rms_sequence(
const axutil_env_t *env,
axis2_msg_ctx_t *first_app_msg,
- axis2_char_t *rms_internal_sequence_id,
+ axis2_char_t *internal_sequence_id,
axis2_char_t *spec_version,
sandesha2_seq_property_mgr_t *seq_prop_mgr)
{
@@ -350,7 +350,7 @@
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Entry:sandesha2_seq_mgr_setup_new_rms_sequence");
AXIS2_PARAM_CHECK(env->error, first_app_msg, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, rms_internal_sequence_id, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, internal_sequence_id, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, spec_version, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_prop_mgr, AXIS2_FAILURE);
@@ -385,7 +385,7 @@
addr_ns_val = AXIS2_WSA_NAMESPACE;
}
- addr_ns_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
+ addr_ns_bean = sandesha2_seq_property_bean_create_with_data(env, internal_sequence_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, addr_ns_val);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, addr_ns_bean);
@@ -400,7 +400,7 @@
if (to_epr)
{
- to_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
+ to_bean = sandesha2_seq_property_bean_create_with_data(env, internal_sequence_id,
SANDESHA2_SEQ_PROP_TO_EPR, (axis2_char_t*)axis2_endpoint_ref_get_address(to_epr,
env));
}
@@ -426,7 +426,7 @@
if(reply_to_epr)
{
- reply_to_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
+ reply_to_bean = sandesha2_seq_property_bean_create_with_data(env, internal_sequence_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR, (axis2_char_t*)axis2_endpoint_ref_get_address(
reply_to_epr, env));
}
@@ -444,7 +444,7 @@
if(reply_to_epr)
{
- reply_to_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
+ reply_to_bean = sandesha2_seq_property_bean_create_with_data(env, internal_sequence_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR, (axis2_char_t*)axis2_endpoint_ref_get_address(
reply_to_epr, env));
@@ -456,10 +456,10 @@
acks_to_str = anon_uri;
}
- acks_to_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
+ acks_to_bean = sandesha2_seq_property_bean_create_with_data(env, internal_sequence_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR, acks_to_str);
- msgs_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
+ msgs_bean = sandesha2_seq_property_bean_create_with_data(env, internal_sequence_id,
SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES, "");
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, msgs_bean);
@@ -483,17 +483,17 @@
if(transport_to)
{
sandesha2_seq_property_bean_t *transport_to_bean = NULL;
- transport_to_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
+ transport_to_bean = sandesha2_seq_property_bean_create_with_data(env, internal_sequence_id,
SANDESHA2_SEQ_PROP_TRANSPORT_TO, transport_to);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, transport_to_bean);
}
- spec_version_bean = sandesha2_seq_property_bean_create_with_data(env, rms_internal_sequence_id,
+ spec_version_bean = sandesha2_seq_property_bean_create_with_data(env, internal_sequence_id,
SANDESHA2_SEQ_PROP_RM_SPEC_VERSION, spec_version);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, spec_version_bean);
- sandesha2_seq_mgr_update_last_activated_time(env, rms_internal_sequence_id, seq_prop_mgr);
+ sandesha2_seq_mgr_update_last_activated_time(env, internal_sequence_id, seq_prop_mgr);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "Exit:sandesha2_seq_mgr_setup_new_rms_sequence");
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=666527&r1=666526&r2=666527&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 Tue Jun 10 22:11:22 2008
@@ -607,7 +607,7 @@
}
find_create_seq_bean = sandesha2_create_seq_bean_create(env);
- sandesha2_create_seq_bean_set_rms_internal_sequence_id(find_create_seq_bean, env,
+ sandesha2_create_seq_bean_set_internal_sequence_id(find_create_seq_bean, env,
internal_seq_id);
found_list = sandesha2_create_seq_mgr_find(create_seq_mgr, env,
find_create_seq_bean);
@@ -816,7 +816,7 @@
/* If server side and single channel duplex mode send the terminate sequence
* message.
*/
- if(axis2_msg_ctx_get_server_side(msg_ctx, env) && sandesha2_utils_is_single_channel(env, rm_ver,
+ if(axis2_msg_ctx_get_server_side(msg_ctx, env) && sandesha2_utils_is_rm_1_0_anonymous_acks_to(env, rm_ver,
to_addr))
{
axis2_msg_ctx_t *msg_ctx2 = NULL;
@@ -994,7 +994,6 @@
{
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_LOG_DEBUG(env->log, AXIS2_LOG_SI, "retrans_delay:%ld*************************", retrans_delay);
AXIS2_SLEEP(retrans_delay);
@@ -1002,7 +1001,6 @@
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