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 2007/12/01 06:26:19 UTC
svn commit: r600047 - in /webservices/sandesha/trunk/c:
samples/rm_echo_1_1/rm_echo_1_1.c samples/rm_ping_1_1/rm_ping_1_1.c
src/storage/mysql/permanent_sender_mgr.c
Author: damitha
Date: Fri Nov 30 21:25:58 2007
New Revision: 600047
URL: http://svn.apache.org/viewvc?rev=600047&view=rev
Log:
Now RM 1.1 ping, echo and echo_single works. But server side does not send the terminate sequence in the dual channel scenario.
Modified:
webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c
webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c
webservices/sandesha/trunk/c/src/storage/mysql/permanent_sender_mgr.c
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c?rev=600047&r1=600046&r2=600047&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_1/rm_echo_1_1.c Fri Nov 30 21:25:58 2007
@@ -223,7 +223,7 @@
axis2_callback_set_on_error(callback4, rm_echo_callback_on_error);
sandesha2_client_terminate_seq_with_svc_client(env, svc_client, callback4,
listener_manager);
- AXIS2_SLEEP(SANDESHA2_MAX_COUNT);
+ AXIS2_SLEEP(2*SANDESHA2_MAX_COUNT);
AXIS2_FREE(env->allocator, seq_key);
if (svc_client)
{
Modified: webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c?rev=600047&r1=600046&r2=600047&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_ping_1_1/rm_ping_1_1.c Fri Nov 30 21:25:58 2007
@@ -161,7 +161,7 @@
/** Wait till callback is complete. Simply keep the parent thread running
until our on_complete or on_error is invoked */
- /*AXIS2_SLEEP(MAX_COUNT);*/
+ AXIS2_SLEEP(MAX_COUNT);
if (svc_client)
{
Modified: webservices/sandesha/trunk/c/src/storage/mysql/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/mysql/permanent_sender_mgr.c?rev=600047&r1=600046&r2=600047&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/mysql/permanent_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/mysql/permanent_sender_mgr.c Fri Nov 30 21:25:58 2007
@@ -543,8 +543,8 @@
long temp_time_to_send = 0;
axis2_char_t *msg_id = NULL;
axis2_char_t *temp_msg_id = NULL;
- axis2_char_t *seq_id = NULL;
- axis2_char_t *temp_seq_id = NULL;
+ axis2_char_t *internal_seq_id = NULL;
+ axis2_char_t *temp_internal_seq_id = NULL;
long msg_no = 0;
long temp_msg_no = 0;
int msg_type = 0;
@@ -575,13 +575,15 @@
{
add = AXIS2_FALSE;
}
- seq_id = sandesha2_sender_bean_get_seq_id(
+ internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(
(sandesha2_sender_bean_t *) bean, env);
- temp_seq_id = sandesha2_sender_bean_get_seq_id(
+ temp_internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(
(sandesha2_sender_bean_t *) candidate,
env);
- if(seq_id && temp_seq_id && 0 != axutil_strcmp(
- seq_id, temp_seq_id))
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "temp_internal_seq_id:%s",
+ temp_internal_seq_id);
+ if(internal_seq_id && temp_internal_seq_id && 0 != axutil_strcmp(
+ internal_seq_id, temp_internal_seq_id))
{
add = AXIS2_FALSE;
}
@@ -628,9 +630,10 @@
axutil_array_list_t *match_list = NULL;
sandesha2_permanent_sender_mgr_t *sender_mgr_impl = NULL;
sandesha2_sender_bean_t *result = NULL;
- AXIS2_ENV_CHECK(env, NULL);
sender_mgr_impl = SANDESHA2_INTF_TO_IMPL(sender_mgr);
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Entry:sandesha2_permanent_sender_mgr_get_next_msg_to_send");
sandesha2_sender_bean_set_send(matcher, env, AXIS2_TRUE);
time_now = sandesha2_utils_get_current_time_in_millis(env);
sandesha2_sender_bean_set_time_to_send(matcher, env, time_now);
@@ -660,6 +663,7 @@
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]dam_msg_type:%d", msg_type);
if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
{
long msg_no = sandesha2_sender_bean_get_msg_no(bean, env);
@@ -675,6 +679,8 @@
break;
}
}
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[sandesha2]Exit:sandesha2_permanent_sender_mgr_get_next_msg_to_send");
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org