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/03/07 09:58:15 UTC
svn commit: r515500 - in /webservices/sandesha/trunk/c: config/module.xml
samples/rm_echo_single_1_0/rm_echo_single.c
src/msgprocessors/app_msg_processor.c
src/msgprocessors/terminate_seq_msg_processor.c src/util/ack_mgr.c
src/workers/sender_worker.c
Author: damitha
Date: Wed Mar 7 00:58:14 2007
New Revision: 515500
URL: http://svn.apache.org/viewvc?view=rev&rev=515500
Log:
little bit of code formatting
Modified:
webservices/sandesha/trunk/c/config/module.xml
webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
Modified: webservices/sandesha/trunk/c/config/module.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/module.xml?view=diff&rev=515500&r1=515499&r2=515500
==============================================================================
--- webservices/sandesha/trunk/c/config/module.xml (original)
+++ webservices/sandesha/trunk/c/config/module.xml Wed Mar 7 00:58:14 2007
@@ -73,11 +73,10 @@
<parameter name="ExponentialBackoff" locked="false">AXIS2_TRUE</parameter>
<parameter name="RetransmissionInterval" locked="false">4000</parameter>
<parameter name="AcknowledgementInterval" locked="false">4000</parameter>
- <!--parameter name="InactivityTimeout" locked="false">60000</parameter-->
- <parameter name="InactivityTimeout" locked="false">100</parameter>
+ <parameter name="InactivityTimeout" locked="false">60000</parameter>
<parameter name="StorageManager" locked="false">persistent</parameter>
<parameter name="InvokeInOrder" locked="false">AXIS2_FALSE</parameter>
<parameter name="MessageTypesToDrop" locked="false">none</parameter>
- <parameter name="MaxRetransCount" locked="false">2</parameter>
+ <parameter name="MaxRetransCount" locked="false">10</parameter>
</module>
Modified: webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c?view=diff&rev=515500&r1=515499&r2=515500
==============================================================================
--- webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c (original)
+++ webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c Wed Mar 7 00:58:14 2007
@@ -191,7 +191,6 @@
}
payload = build_om_payload_for_echo_svc(env, "echo1", "sequence1");
result = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
-
/*svc_ctx = AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
conf_ctx = axis2_svc_ctx_get_conf_ctx(svc_ctx, env);
result = sandesha2_client_get_response_envelope(env, conf_ctx, svc_client, 1);*/
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?view=diff&rev=515500&r1=515499&r2=515500
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Mar 7 00:58:14 2007
@@ -130,8 +130,8 @@
AXIS2_ENV_CHECK(env, NULL);
msg_proc_impl = (sandesha2_app_msg_processor_impl_t *)AXIS2_MALLOC
- (env->allocator,
- sizeof(sandesha2_app_msg_processor_impl_t));
+ (env->allocator,
+ sizeof(sandesha2_app_msg_processor_impl_t));
if(!msg_proc_impl)
{
@@ -144,15 +144,15 @@
if(!msg_proc_impl->msg_processor.ops)
{
sandesha2_app_msg_processor_free((sandesha2_msg_processor_t*)
- msg_proc_impl, env);
+ msg_proc_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
msg_proc_impl->msg_processor.ops->process_in_msg =
- sandesha2_app_msg_processor_process_in_msg;
+ sandesha2_app_msg_processor_process_in_msg;
msg_proc_impl->msg_processor.ops->process_out_msg =
- sandesha2_app_msg_processor_process_out_msg;
+ sandesha2_app_msg_processor_process_out_msg;
msg_proc_impl->msg_processor.ops->free = sandesha2_app_msg_processor_free;
return &(msg_proc_impl->msg_processor);
@@ -570,13 +570,6 @@
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_app_msg_processor_process_in_msg");
- /*{
- axis2_svc_ctx_t *svc_ctx = AXIS2_OP_CTX_GET_PARENT(op_ctx, env);
- axis2_ctx_t *ctx = AXIS2_SVC_CTX_GET_BASE((const axis2_svc_ctx_t *)svc_ctx, env);
- AXIS2_CTX_SET_PROPERTY(ctx, env, AXIS2_RESPONSE_SOAP_ENVELOPE,
- axis2_property_create_with_args(env, 0, 0, 0,
- (void*)axis2_msg_ctx_get_soap_envelope(msg_ctx, env)), AXIS2_FALSE);
- }*/
return AXIS2_SUCCESS;
}
@@ -749,12 +742,12 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Invalid message number");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_MSG_NUM,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
}
system_msg_num = sandesha2_app_msg_processor_get_prev_msg_no(env,
- internal_seq_id, storage_mgr);
+ internal_seq_id, storage_mgr);
if(msg_num_lng > 0 && msg_num_lng <= system_msg_num)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -841,23 +834,23 @@
incoming_to = AXIS2_STRDUP(value, env);
property = axis2_property_create_with_args(env, 0, 0, 0, incoming_to);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_SEQ_PROP_TO_EPR,
- property, AXIS2_FALSE);
+ property, AXIS2_FALSE);
}
req_rm_msg_ctx = sandesha2_msg_init_init_msg(env, req_msg_ctx);
seq = (sandesha2_seq_t *) sandesha2_msg_ctx_get_msg_part(
- req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
+ req_rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
req_seq_id = sandesha2_identifier_get_identifier(
- sandesha2_seq_get_identifier(seq, env), env);
+ sandesha2_seq_get_identifier(seq, env), env);
spec_ver_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
- env, req_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
+ env, req_seq_id, SANDESHA2_SEQ_PROP_RM_SPEC_VERSION);
if(!spec_ver_bean)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[sandesha2] Invalid spec version");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_SPEC_VERSION,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
spec_ver = sandesha2_seq_property_bean_get_value(spec_ver_bean, env);
@@ -886,26 +879,25 @@
axis2_char_t *anon_uri = NULL;
res_create_seq_added = sandesha2_seq_property_mgr_retrieve(
- seq_prop_mgr, env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT);
+ seq_prop_mgr, env, internal_seq_id,
+ SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT);
addr_ns_uri = sandesha2_utils_get_seq_property(env, internal_seq_id,
- SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
- storage_mgr);
+ SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE,
+ storage_mgr);
anon_uri = sandesha2_spec_specific_consts_get_anon_uri(env, addr_ns_uri);
if(!res_create_seq_added)
{
axis2_char_t *acks_to = NULL;
res_create_seq_added = sandesha2_seq_property_bean_create_with_data(
- env, internal_seq_id,
- SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT,
- SANDESHA2_VALUE_TRUE);
+ env, internal_seq_id, SANDESHA2_SEQ_PROP_OUT_CREATE_SEQ_SENT,
+ SANDESHA2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env,
- res_create_seq_added);
+ res_create_seq_added);
if(AXIS2_MSG_CTX_GET_SVC_CTX(msg_ctx, env))
{
property = axis2_msg_ctx_get_property(msg_ctx, env,
- SANDESHA2_CLIENT_ACKS_TO, AXIS2_FALSE);
+ SANDESHA2_CLIENT_ACKS_TO, AXIS2_FALSE);
if(property)
acks_to = axis2_property_get_value(property, env);
}
@@ -915,7 +907,7 @@
acks_to_epr = AXIS2_MSG_CTX_GET_TO(req_msg_ctx, env);
acks_to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
- acks_to_epr, env);
+ acks_to_epr, env);
}
else if(!acks_to)
acks_to = anon_uri;
@@ -926,10 +918,10 @@
sandesha2_seq_property_bean_t *reply_to_epr_bean = NULL;
incoming_seq_id = sandesha2_utils_get_svr_side_incoming_seq_id(
- env, internal_seq_id);
+ env, internal_seq_id);
reply_to_epr_bean = sandesha2_seq_property_mgr_retrieve(
- seq_prop_mgr, env, incoming_seq_id,
- SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
+ seq_prop_mgr, env, incoming_seq_id,
+ SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
if(reply_to_epr_bean)
{
axis2_endpoint_ref_t *acks_epr = NULL;
@@ -1285,12 +1277,6 @@
internal_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR);
out_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env,
internal_seq_id, SANDESHA2_SEQ_PROP_OUT_SEQ_ID);
- /*if(!to_bean)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] To is NULL");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NULL_TO, AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }*/
if (to_bean)
{
@@ -1329,9 +1315,6 @@
else if (to_epr)
sandesha2_msg_ctx_set_to(rm_msg_ctx, env, to_epr);
- /*if(reply_to_epr)
- sandesha2_msg_ctx_set_reply_to(rm_msg_ctx, env, reply_to_epr);*/
-
rm_version = sandesha2_utils_get_rm_version(env, internal_seq_id, storage_mgr);
if(!rm_version)
{
@@ -1406,10 +1389,6 @@
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
app_msg_entry = sandesha2_sender_bean_create(env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sandesha to_addr = %s ", to_addr);
- /*if(1 < msg_num && !axis2_msg_ctx_get_server_side(app_msg_ctx, env))
- {
- return AXIS2_SUCCESS;
- }*/
if(axis2_msg_ctx_get_server_side(app_msg_ctx, env) &&
sandesha2_utils_is_single_channel(env, rm_version, to_addr))
{
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=515500&r1=515499&r2=515500
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed Mar 7 00:58:14 2007
@@ -55,7 +55,7 @@
* Sandesha2 Terminate Sequence Msg Processor
*/
typedef struct sandesha2_terminate_seq_msg_processor_impl
- sandesha2_terminate_seq_msg_processor_impl_t;
+ sandesha2_terminate_seq_msg_processor_impl_t;
struct sandesha2_terminate_seq_msg_processor_impl
{
@@ -63,8 +63,8 @@
};
#define SANDESHA2_INTF_TO_IMPL(msg_proc) \
- ((sandesha2_terminate_seq_msg_processor_impl_t *)\
- (msg_proc))
+ ((sandesha2_terminate_seq_msg_processor_impl_t *)\
+ (msg_proc))
/***************************** Function headers *******************************/
static axis2_status_t AXIS2_CALL
@@ -109,8 +109,8 @@
AXIS2_ENV_CHECK(env, NULL);
msg_proc_impl = ( sandesha2_terminate_seq_msg_processor_impl_t *)AXIS2_MALLOC
- (env->allocator,
- sizeof( sandesha2_terminate_seq_msg_processor_impl_t));
+ (env->allocator,
+ sizeof( sandesha2_terminate_seq_msg_processor_impl_t));
if(!msg_proc_impl)
{
@@ -123,17 +123,17 @@
if(!msg_proc_impl->msg_processor.ops)
{
sandesha2_terminate_seq_msg_processor_free((sandesha2_msg_processor_t*)
- msg_proc_impl, env);
+ msg_proc_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
msg_proc_impl->msg_processor.ops->process_in_msg =
- sandesha2_terminate_seq_msg_processor_process_in_msg;
+ sandesha2_terminate_seq_msg_processor_process_in_msg;
msg_proc_impl->msg_processor.ops->process_out_msg =
- sandesha2_terminate_seq_msg_processor_process_out_msg;
+ sandesha2_terminate_seq_msg_processor_process_out_msg;
msg_proc_impl->msg_processor.ops->free =
- sandesha2_terminate_seq_msg_processor_free;
+ sandesha2_terminate_seq_msg_processor_free;
return &(msg_proc_impl->msg_processor);
}
@@ -392,7 +392,6 @@
SANDESHA2_VALUE_TRUE);
axis2_msg_ctx_set_property(out_msg_ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE, property, AXIS2_FALSE);
- /*AXIS2_MSG_CTX_SET_RESPONSE_WRITTEN(out_msg_ctx, env, AXIS2_TRUE);*/
/* test code */
@@ -409,7 +408,6 @@
property = axis2_property_create_with_args(env, 0, 0, 0, key);
axis2_msg_ctx_set_property(out_msg_ctx, env, SANDESHA2_MESSAGE_STORE_KEY,
property, AXIS2_FALSE);
- /*char *action = axis2_msg_ctx_get_wsa_action(out_msg_ctx, env);*/
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key, out_msg_ctx);
/* TODO: refine the terminate delay */
@@ -481,33 +479,33 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log,
- "[sandesha2] sandesha2_terminate_msg_processor_process_out_msg .........");
+ "[sandesha2] sandesha2_terminate_msg_processor_process_out_msg .........");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
+ AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(storage_mgr, env);
to_address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
- AXIS2_MSG_CTX_GET_TO(msg_ctx, env), env);
+ AXIS2_MSG_CTX_GET_TO(msg_ctx, env), env);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY,
- AXIS2_FALSE);
+ AXIS2_FALSE);
if(property)
seq_key = AXIS2_PROPERTY_GET_VALUE(property, env);
int_seq_id = sandesha2_utils_get_internal_seq_id(env, to_address, seq_key);
out_seq_id = sandesha2_utils_get_seq_property(env, int_seq_id,
- SANDESHA2_SEQ_PROP_OUT_SEQ_ID, storage_mgr);
+ SANDESHA2_SEQ_PROP_OUT_SEQ_ID, storage_mgr);
if(!out_seq_id)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] seq_id was not"
- " found. Cannot send the terminate message");
+ " found. Cannot send the terminate message");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_CANNOT_FIND_SEQ_ID,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
terminated = sandesha2_utils_get_seq_property(env, int_seq_id,
- SANDESHA2_SEQ_PROP_TERMINATE_ADDED, storage_mgr);
+ SANDESHA2_SEQ_PROP_TERMINATE_ADDED, storage_mgr);
old_op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
qname = axis2_qname_create(env, "temp", NULL, NULL);
@@ -515,7 +513,7 @@
out_in_op = axis2_op_create_with_qname(env, qname);
AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(out_in_op, env, AXIS2_MEP_URI_OUT_IN);
AXIS2_OP_SET_IN_FLOW(out_in_op, env,
- AXIS2_OP_GET_IN_FLOW(old_op, env));
+ AXIS2_OP_GET_IN_FLOW(old_op, env));
axis2_allocator_switch_to_global_pool(env->allocator);
op_ctx = axis2_op_ctx_create(env, out_in_op, NULL);
@@ -531,9 +529,9 @@
return AXIS2_SUCCESS;
}
term_seq_part = (sandesha2_terminate_seq_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
+ rm_msg_ctx, env, SANDESHA2_MSG_PART_TERMINATE_SEQ);
sandesha2_identifier_set_identifier(sandesha2_terminate_seq_get_identifier(
- term_seq_part, env), env, out_seq_id);
+ term_seq_part, env), env, out_seq_id);
sandesha2_msg_ctx_set_flow(rm_msg_ctx, env, AXIS2_OUT_FLOW);
property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE);
axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_APPLICATION_PROCESSING_DONE,
@@ -543,18 +541,18 @@
if(!rm_version)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cant find the"
- " rm_version of the given message");
+ " rm_version of the given message");
return AXIS2_FAILURE;
}
AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env,
- sandesha2_spec_specific_consts_get_terminate_seq_action(
- env, rm_version));
+ sandesha2_spec_specific_consts_get_terminate_seq_action(
+ env, rm_version));
temp_action = sandesha2_spec_specific_consts_get_terminate_seq_soap_action
(env, rm_version);
soap_action = axis2_string_create(env, temp_action);
axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action);
transport_to = sandesha2_utils_get_seq_property(env, int_seq_id,
- SANDESHA2_SEQ_PROP_TRANSPORT_TO, storage_mgr);
+ SANDESHA2_SEQ_PROP_TRANSPORT_TO, storage_mgr);
if(transport_to)
{
@@ -590,28 +588,6 @@
sandesha2_seq_property_bean_set_seq_id(term_added, env, out_seq_id);
sandesha2_seq_property_bean_set_value(term_added, env, SANDESHA2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_added);
-
- /*out_desc = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env);
-
- property = axis2_property_create_with_args(env, 0, 0,
- out_desc->ops->free_void_arg, out_desc);
- axis2_msg_ctx_set_property(msg_ctx, env,
- SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE);
-
- property = axis2_property_create_with_args(env, 0, 0, 0, key);
- axis2_msg_ctx_set_property(msg_ctx, env,
- SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE);
-
- property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_TRUE);
- property = axis2_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_VALUE_FALSE);
- axis2_msg_ctx_set_property(msg_ctx, env,
- SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE);
- sandesha2_out_desc = sandesha2_utils_get_transport_out(env);
- AXIS2_MSG_CTX_SET_TRANSPORT_OUT_DESC(msg_ctx, env, sandesha2_out_desc);
- transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(sandesha2_out_desc,
- env);*/
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx, int_seq_id,
AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env), storage_mgr);
AXIS2_LOG_INFO(env->log,
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=515500&r1=515499&r2=515500
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed Mar 7 00:58:14 2007
@@ -418,7 +418,7 @@
to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to, env);
found_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env,
- find_bean);
+ find_bean);
for(i = 0; i < axis2_array_list_size(found_list, env); i++)
{
sandesha2_sender_bean_t *sender_bean = NULL;
@@ -438,9 +438,9 @@
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);
+ msg_ctx_ref_key, conf_ctx);
to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
- AXIS2_MSG_CTX_GET_TO(msg_ctx1, env), env);
+ AXIS2_MSG_CTX_GET_TO(msg_ctx1, env), env);
if(0 == AXIS2_STRCMP(to, to_str))
continue;
/*axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((const sandesha2_sender_bean_t *)sender_bean, env);*/
@@ -451,20 +451,20 @@
msg_ctx_ref_key);
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))
+ env))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid"
- " ack message entry");
+ " ack message entry");
return AXIS2_FAILURE;
}
seq_ack = (sandesha2_iom_rm_part_t *)sandesha2_msg_ctx_get_msg_part(
- ack_rm_msg, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
+ ack_rm_msg, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
sandesha2_msg_ctx_set_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT, seq_ack);
+ SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT, seq_ack);
sandesha2_msg_ctx_add_soap_envelope(rm_msg_ctx, env);
break;
}
-
}
return AXIS2_SUCCESS;
}
+
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=515500&r1=515499&r2=515500
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Wed Mar 7 00:58:14 2007
@@ -409,9 +409,9 @@
seq_id = sandesha2_identifier_get_identifier(identifier, env);
}
if(sandesha2_sender_worker_is_piggybackable_msg_type(sender_worker, env,
- msg_type) && AXIS2_FALSE ==
- sandesha2_sender_worker_is_ack_already_piggybacked(sender_worker, env,
- rm_msg_ctx))
+ msg_type) && AXIS2_FALSE ==
+ sandesha2_sender_worker_is_ack_already_piggybacked(sender_worker, env,
+ rm_msg_ctx))
{
sandesha2_ack_mgr_piggyback_acks_if_present(env, rm_msg_ctx,
storage_mgr);
@@ -558,7 +558,7 @@
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
if(sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
- SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT))
+ SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT))
return AXIS2_TRUE;
return AXIS2_FALSE;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org