Author: damitha
Date: Fri Sep 1 02:06:58 2006
New Revision: 439243
URL: http://svn.apache.org/viewvc?rev=439243&view=rev
Log:
More bug fixes
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?rev=439243&r1=439242&r2=439243&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Fri Sep
1 02:06:58 2006
@@ -228,7 +228,7 @@
}
int_seq_id = sandesha2_utils_get_seq_property(env, out_seq_id,
SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);
- sandesha2_seq_manager_update_last_activated_time(env, int_seq_id,
+ sandesha2_seq_mgr_update_last_activated_time(env, int_seq_id,
storage_mgr);
int_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env,
out_seq_id, SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID);
@@ -252,18 +252,24 @@
SANDESHA2_SENDER_BEAN_SET_RESEND(input_bean, env, AXIS2_TRUE);
retrans_list = SANDESHA2_SENDER_MGR_FIND_BY_SENDER_BEAN(retrans_mgr, env,
input_bean);
-
+
+ acked_list = axis2_array_list_create(env, 0);
+ if(!acked_list)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(ack_range_list, env); i++)
{
sandesha2_ack_range_t *ack_range = NULL;
long lower = -1;
long upper = -1;
- int j = 0;
+ long j = 0;
ack_range = AXIS2_ARRAY_LIST_GET(ack_range_list, env, i);
lower = SANDESHA2_ACK_RANGE_GET_LOWER_VALUE(ack_range, env);
upper = SANDESHA2_ACK_RANGE_GET_UPPER_VALUE(ack_range, env);
- for(j = lower; j < upper; j++)
+ for(j = lower; j <= upper; j++)
{
sandesha2_sender_bean_t *retrans_bean = NULL;
long *add_no = NULL;
@@ -304,7 +310,7 @@
out_seq_id);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(no_of_msgs_acked_bean, env,
str_long);
- SANDESHA2_SEQ_PROPERY_MGR_INSERT(seq_prop_mgr, env,
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env,
no_of_msgs_acked_bean);
}
else
@@ -323,7 +329,7 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(completed_bean, env,
int_seq_id);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_NAME(completed_bean, env,
SANDESHA2_SEQ_PROP_CLIENT_COMPLETED_MESSAGES);
- SANDESHA2_SEQ_PROPERY_MGR_INSERT(seq_prop_mgr, env, completed_bean);
+ SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, completed_bean);
}
str_list = sandesha2_utils_array_list_to_string(env, acked_list,
SANDESHA2_ARRAY_LIST_LONG);
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=439243&r1=439242&r2=439243&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Fri Sep
1 02:06:58 2006
@@ -500,7 +500,6 @@
/* Start the invoker if stopped */
sandesha2_utils_start_invoker_for_seq(env, conf_ctx, str_seq_id);
}
- /* test code uncomment this when send_ack_if_reqd method function
correctly */
sandesha2_app_msg_processor_send_ack_if_reqd(msg_processor, env, msg_ctx,
msgs_str, storage_man);
return AXIS2_SUCCESS;
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c?rev=439243&r1=439242&r2=439243&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c Fri Sep 1
02:06:58 2006
@@ -497,8 +497,8 @@
sandesha2_sender_bean_t *AXIS2_CALL
sandesha2_sender_mgr_get_next_msg_to_send(
- sandesha2_sender_mgr_t *sender,
- const axis2_env_t *env)
+ sandesha2_sender_mgr_t *sender,
+ const axis2_env_t *env)
{
sandesha2_sender_mgr_impl_t *sender_impl = NULL;
long lowest_app_msg_no = 0;
Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?rev=439243&r1=439242&r2=439243&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Fri Sep 1 02:06:58 2006
@@ -466,12 +466,6 @@
seq_ack_impl = SANDESHA2_INTF_TO_IMPL(seq_ack);
soap_header = (axiom_soap_header_t*)om_node;
- if(NULL == seq_ack_impl->identifier)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
- AXIS2_FAILURE);
- return NULL;
- }
rm_ns = axiom_namespace_create(env, seq_ack_impl->ns_val,
SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
if(NULL == rm_ns)
@@ -484,9 +478,17 @@
{
return NULL;
}
+ if(NULL == seq_ack_impl->identifier)
+ {
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
+ AXIS2_FAILURE);
+ return NULL;
+ }
AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(sa_block, env,
seq_ack_impl->must_understand);
sa_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(sa_block, env);
+ SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_ack_impl->identifier, env,
sa_node);
+
for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(seq_ack_impl->ack_range_list, env);
i++)
{
sandesha2_ack_range_t *ack_range = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
