Author: damitha
Date: Sat Mar 1 01:03:28 2008
New Revision: 632571
URL: http://svn.apache.org/viewvc?rev=632571&view=rev
Log:
Fixed Jira SANDESHA2C-41
Modified:
webservices/sandesha/trunk/c/samples/rm_echo_1_0_large_sequence/rm_echo.c
webservices/sandesha/trunk/c/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/workers/sender.c
Modified:
webservices/sandesha/trunk/c/samples/rm_echo_1_0_large_sequence/rm_echo.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_0_large_sequence/rm_echo.c?rev=632571&r1=632570&r2=632571&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_0_large_sequence/rm_echo.c
(original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_0_large_sequence/rm_echo.c
Sat Mar 1 01:03:28 2008
@@ -167,7 +167,7 @@
axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY,
property);
}
- for(i = 1; i < 10; i++)
+ for(i = 1; i < 100; i++)
{
axis2_char_t echo_str[7];
sprintf(echo_str, "%s%d", "echo", i);
@@ -181,7 +181,7 @@
axis2_svc_client_remove_all_headers(svc_client, env);
property = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_TRUE);
axis2_options_set_property(options, env, "Sandesha2LastMessage", property);
- payload = build_om_payload_for_echo_svc(env, "echo10", seq_key);
+ payload = build_om_payload_for_echo_svc(env, "echo100", seq_key);
callback2 = axis2_callback_create(env);
axis2_callback_set_on_complete(callback2, rm_echo_callback_on_complete);
axis2_callback_set_on_error(callback2, rm_echo_callback_on_error);
Modified:
webservices/sandesha/trunk/c/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c?rev=632571&r1=632570&r2=632571&view=diff
==============================================================================
---
webservices/sandesha/trunk/c/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c
(original)
+++
webservices/sandesha/trunk/c/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c
Sat Mar 1 01:03:28 2008
@@ -153,7 +153,7 @@
status = axis2_svc_client_send_robust(svc_client, env, payload);
if(status)
printf("\nping client invoke SUCCESSFUL!\n");
- sleep(32);
+ sleep(64);
/** Wait till callback is complete. Simply keep the parent thread running
until our on_complete or on_error is invoked */
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?rev=632571&r1=632570&r2=632571&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Sat Mar
1 01:03:28 2008
@@ -1908,12 +1908,12 @@
}
temp_op_ctx = axis2_msg_ctx_get_op_ctx(app_msg_ctx, env);
axis2_op_ctx_increment_ref(temp_op_ctx, env);
- sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, storage_key,
app_msg_ctx);
- sandesha2_sender_mgr_insert(sender_mgr, env, app_msg_entry);
-
property = axutil_property_create_with_args(env, 0, 0, 0,
AXIS2_VALUE_FALSE);
axis2_msg_ctx_set_property(app_msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, property);
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, storage_key,
app_msg_ctx);
+ sandesha2_sender_mgr_insert(sender_mgr, env, app_msg_entry);
+
trs_sender = axis2_transport_out_desc_get_sender(
axis2_msg_ctx_get_transport_out_desc(app_msg_ctx, env), env);
if(trs_sender)
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?rev=632571&r1=632570&r2=632571&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Sat Mar 1 01:03:28
2008
@@ -678,11 +678,6 @@
if(property)
axis2_msg_ctx_set_property(new_msg, env, AXIS2_TRANSPORT_IN,
axutil_property_clone(property, env));
- property = axis2_msg_ctx_get_property(ref_msg, env,
- AXIS2_HTTP_OUT_TRANSPORT_INFO);
- if(property)
- axis2_msg_ctx_set_property(new_msg, env,
AXIS2_HTTP_OUT_TRANSPORT_INFO,
- axutil_property_clone(property, env));
axis2_msg_ctx_set_http_out_transport_info(new_msg, env,
axis2_msg_ctx_get_http_out_transport_info(ref_msg, env));
property = axis2_msg_ctx_get_property(ref_msg, env,
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?rev=632571&r1=632570&r2=632571&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Sat Mar 1 01:03:28 2008
@@ -123,11 +123,9 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_char_t *seq_id = NULL;
axis2_bool_t persistent_msg_ctx = AXIS2_FALSE;
- axutil_thread_mutex_t *mutex = NULL;
args = (sandesha2_sender_args_t*)data;
env = args->env;
- mutex = axutil_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
axutil_allocator_switch_to_global_pool(env->allocator);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_sender_worker_func");
@@ -157,10 +155,8 @@
sandesha2_sender_bean_t *sender_bean = NULL;
axis2_char_t *msg_id = NULL;
- axutil_thread_mutex_lock(mutex);
sender_bean = sandesha2_sender_mgr_get_next_msg_to_send(sender_mgr,
env,
seq_id);
- axutil_thread_mutex_unlock(mutex);
if(!sender_bean)
{
AXIS2_USLEEP(sleep_time);
@@ -170,11 +166,9 @@
if(msg_id)
{
axis2_bool_t status = AXIS2_TRUE;
- axutil_thread_mutex_lock(mutex);
status = sandesha2_sender_worker_send(env, conf_ctx, msg_id,
persistent_msg_ctx, storage_mgr, seq_prop_mgr,
create_seq_mgr, sender_mgr);
- axutil_thread_mutex_unlock(mutex);
if(!status)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
@@ -185,8 +179,6 @@
if(sender_bean)
sandesha2_sender_bean_free(sender_bean, env);
}
- if(mutex)
- axutil_thread_mutex_destroy(mutex);
#ifdef AXIS2_SVR_MULTI_THREADED
AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
