Author: sahan
Date: Tue Jul 17 21:49:05 2007
New Revision: 557149
URL: http://svn.apache.org/viewvc?view=rev&rev=557149
Log:
Fixing several bugs related to:
Sending TSR
copy_samples.sh
removing message context at TS
Modified:
webservices/sandesha/trunk/c/copy_samples.sh
webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified: webservices/sandesha/trunk/c/copy_samples.sh
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/copy_samples.sh?view=diff&rev=557149&r1=557148&r2=557149
==============================================================================
--- webservices/sandesha/trunk/c/copy_samples.sh (original)
+++ webservices/sandesha/trunk/c/copy_samples.sh Tue Jul 17 21:49:05 2007
@@ -1,6 +1,6 @@
cd $1
-find -name "*.svn" |xargs rm -rf
-find -name "*.libs" |xargs rm -rf
-find -name "*.deps" |xargs rm -rf
-find -name "Makefile" |xargs rm -rf
-find -name "autom4te.cache" |xargs rm -rf
+find . -name "*.svn" |xargs rm -rf
+find . -name "*.libs" |xargs rm -rf
+find . -name "*.deps" |xargs rm -rf
+find . -name "Makefile" |xargs rm -rf
+find . -name "autom4te.cache" |xargs rm -rf
Modified: webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c?view=diff&rev=557149&r1=557148&r2=557149
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_1_0/rm_echo.c Tue Jul 17
21:49:05 2007
@@ -112,7 +112,6 @@
options = axis2_options_create(env);
if(endpoint_ref)
axis2_options_set_to(options, env, endpoint_ref);
-
axis2_options_set_use_separate_listener(options, env, AXIS2_TRUE);
/* Separate listner needs addressing, hence addressing stuff in options */
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?view=diff&rev=557149&r1=557148&r2=557149
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
Tue Jul 17 21:49:05 2007
@@ -356,11 +356,11 @@
axis2_char_t *addr_ns_uri = NULL;
axis2_op_ctx_t *op_ctx = NULL;
axis2_endpoint_ref_t *to_epr = NULL;
- axis2_transport_out_desc_t *orig_trans_out = NULL;
+ /*axis2_transport_out_desc_t *orig_trans_out = NULL;
axis2_transport_out_desc_t *trans_out = NULL;
sandesha2_sender_bean_t *term_res_bean = NULL;
axis2_char_t *key = NULL;
- sandesha2_sender_mgr_t *retrans_mgr = NULL;
+ sandesha2_sender_mgr_t *retrans_mgr = NULL;*/
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
@@ -387,33 +387,36 @@
AXIS2_VALUE_TRUE);
axis2_msg_ctx_set_property(out_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property);
-
/* test code */
+ /*
to_epr = axis2_msg_ctx_get_to(out_msg_ctx, env);
if(to_epr && !sandesha2_utils_is_anon_uri(env,
axis2_endpoint_ref_get_address(to_epr, env)))
{
- orig_trans_out = axis2_msg_ctx_get_transport_out_desc(out_msg_ctx,
env);
+ axis2_msg_ctx_t *tsr_msg_ctx = axis2_core_utils_create_out_msg_ctx(
+ env, msg_ctx);
+ orig_trans_out = axis2_msg_ctx_get_transport_out_desc(tsr_msg_ctx,
env);
property = axutil_property_create_with_args(env, 0, 0, 0,
orig_trans_out);
- axis2_msg_ctx_set_property(out_msg_ctx, env,
+ axis2_msg_ctx_set_property(tsr_msg_ctx, env,
SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property);
trans_out = sandesha2_utils_get_transport_out(env);
- axis2_msg_ctx_set_transport_out_desc(out_msg_ctx, env, trans_out);
+ axis2_msg_ctx_set_transport_out_desc(tsr_msg_ctx, env, trans_out);
key = axutil_uuid_gen(env);
term_res_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(term_res_bean, env, key);
property = axutil_property_create_with_args(env, 0, 0, 0, key);
- axis2_msg_ctx_set_property(out_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY,
+ axis2_msg_ctx_set_property(tsr_msg_ctx, env,
SANDESHA2_MESSAGE_STORE_KEY,
property);
- sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key,
out_msg_ctx);
-
+ sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key,
tsr_msg_ctx);
+ */
/* TODO: refine the terminate delay */
+ /*
sandesha2_sender_bean_set_time_to_send(term_res_bean, env,
sandesha2_utils_get_current_time_in_millis(env) +
SANDESHA2_TERMINATE_DELAY);
sandesha2_sender_bean_set_msg_id(term_res_bean, env,
- (axis2_char_t *) axis2_msg_ctx_get_msg_id(out_msg_ctx, env));
+ (axis2_char_t *) axis2_msg_ctx_get_msg_id(tsr_msg_ctx, env));
sandesha2_sender_bean_set_send(term_res_bean, env, AXIS2_TRUE);
property = axutil_property_create_with_args(env, 0, 0, 0,
@@ -423,7 +426,7 @@
sandesha2_sender_bean_set_resend(term_res_bean, env, AXIS2_FALSE);
retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
sandesha2_sender_mgr_insert(retrans_mgr, env, term_res_bean);
- }
+ }*/
/* end test code */
engine = axis2_engine_create(env, axis2_msg_ctx_get_conf_ctx(msg_ctx,
env));
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?view=diff&rev=557149&r1=557148&r2=557149
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Tue Jul 17 21:49:05
2007
@@ -334,7 +334,7 @@
seq_prop_bean, env);
axis2_char_t *name = sandesha2_seq_property_bean_get_name(
seq_prop_bean, env);
- if(axutil_strcmp(name,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER))
+ if(!axutil_strcmp(name,
SANDESHA2_SEQ_PROP_HIGHEST_IN_MSG_NUMBER))
{
highest_in_msg_key_str =
sandesha2_seq_property_bean_get_value(seq_prop_bean,
env);
@@ -562,7 +562,8 @@
create_seq_bean = axutil_array_list_get(found_list, env, i);
key = sandesha2_create_seq_bean_get_ref_msg_store_key(
create_seq_bean, env);
- sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, key);
+ if(key)
+ sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, key);
msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
(sandesha2_rm_bean_t *) create_seq_bean, env);
sandesha2_create_seq_mgr_remove(create_seq_mgr, env, msg_id);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
