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 sa...@apache.org on 2006/09/07 07:03:44 UTC
svn commit: r440976 - in /webservices/sandesha/trunk/c/src: client/ core/
handlers/ msgprocessors/ storage/inmemory/ util/ workers/
Author: sahan
Date: Wed Sep 6 22:03:42 2006
New Revision: 440976
URL: http://svn.apache.org/viewvc?view=rev&rev=440976
Log:
Fixed some warnings
Modified:
webservices/sandesha/trunk/c/src/client/client.c
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/seq_mgr.c
webservices/sandesha/trunk/c/src/workers/sender.c
Modified: webservices/sandesha/trunk/c/src/client/client.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/client.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/client/client.c (original)
+++ webservices/sandesha/trunk/c/src/client/client.c Wed Sep 6 22:03:42 2006
@@ -81,12 +81,12 @@
axis2_char_t *internal_seq_id,
sandesha2_seq_property_mgr_t *seq_prop_mgr);
-static axis2_status_t
+/*static axis2_status_t
sandesha2_client_fill_timedout_outgoing_seq_info(
const axis2_env_t *env,
sandesha2_seq_report_t *report,
axis2_char_t *internal_seq_id,
- sandesha2_seq_property_mgr_t *seq_prop_mgr);
+ sandesha2_seq_property_mgr_t *seq_prop_mgr);*/
static axis2_status_t
sandesha2_client_fill_outgoing_seq_info(
@@ -160,7 +160,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"To address is not set.");
}
- to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
seq_key = (axis2_char_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
svc_ctx = (axis2_svc_ctx_t *)AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
@@ -528,7 +528,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
if(!to)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_EPR_NOT_SET, AXIS2_FAILURE);
@@ -645,7 +645,7 @@
rm_namespc_value, NULL);
terminate_body_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, env,
qname, node, &terminate_body_node);
- old_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+ old_action = (axis2_char_t*)AXIS2_OPTIONS_GET_ACTION(options, env);
action = sandesha2_spec_specific_consts_get_terminate_seq_action(env,
rm_spec_version);
AXIS2_OPTIONS_SET_ACTION(options, env, action);
@@ -745,7 +745,7 @@
rm_namespc_value, NULL);
close_body_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(element, env,
qname, node, &close_body_node);
- old_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+ old_action = (axis2_char_t*)AXIS2_OPTIONS_GET_ACTION(options, env);
action = sandesha2_spec_specific_consts_get_close_seq_action(env,
rm_spec_version);
AXIS2_OPTIONS_SET_ACTION(options, env, action);
@@ -944,7 +944,7 @@
AXIS2_FAILURE);
return NULL;
}
- to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
seq_key = (axis2_char_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
svc_ctx = (axis2_svc_ctx_t *) AXIS2_SVC_CLIENT_GET_SVC_CTX(svc_client, env);
@@ -1037,7 +1037,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
seq_key = (axis2_char_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
rm_spec_version = (axis2_char_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
@@ -1096,7 +1096,7 @@
rm_ns_value, NULL);
ack_requested_header_block = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
element, env, qname, node, &ack_requested_header_block_node);
- old_action = AXIS2_OPTIONS_GET_ACTION(options, env);
+ old_action = (axis2_char_t*)AXIS2_OPTIONS_GET_ACTION(options, env);
action = sandesha2_spec_specific_consts_get_ack_req_action(env,
rm_spec_version);
AXIS2_OPTIONS_SET_ACTION(options, env, action);
@@ -1185,7 +1185,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
seq_key = (axis2_char_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
internal_seq_id = sandesha2_utils_get_internal_seq_id(env, to, seq_key);
@@ -1383,7 +1383,7 @@
return AXIS2_SUCCESS;
}
-static axis2_status_t
+/*static axis2_status_t
sandesha2_client_fill_timedout_outgoing_seq_info(
const axis2_env_t *env,
sandesha2_seq_report_t *report,
@@ -1419,7 +1419,7 @@
out_seq_id = SANDESHA2_SEQ_PROPERTY_BEAN_GET_SEQ_ID(internal_seq_bean, env);
sandesha2_client_fill_outgoing_seq_info(env, report, out_seq_id, seq_prop_mgr);
return AXIS2_SUCCESS;
-}
+}*/
static axis2_status_t
sandesha2_client_fill_outgoing_seq_info(
@@ -1593,7 +1593,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
seq_key = (axis2_char_t *) AXIS2_OPTIONS_GET_PROPERTY(options, env,
SANDESHA2_CLIENT_SEQ_KEY);
internal_seq_id = sandesha2_utils_get_internal_seq_id(env, to, seq_key);
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Wed Sep 6 22:03:42 2006
@@ -546,7 +546,8 @@
AXIS2_ENV_CHECK(env, NULL);
msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
- return AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(msg_ctx_impl->msg_ctx, env);
+ return (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
+ msg_ctx_impl->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
@@ -597,7 +598,7 @@
msg_ctx_impl = SANDESHA2_INTF_TO_IMPL(rm_msg_ctx);
- return AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx_impl->msg_ctx, env);
+ return (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx_impl->msg_ctx, env);
}
axis2_status_t AXIS2_CALL
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Wed Sep 6 22:03:42 2006
@@ -180,7 +180,7 @@
axis2_property_t *property = NULL;
axis2_ctx_t *ctx = NULL;
/* end test code */
- sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;
+ /*sandesha2_msg_ctx_t *req_rm_msg_ctx = NULL;*/
sandesha2_seq_t *seq_part = NULL;
/* test code */
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Wed Sep 6 22:03:42 2006
@@ -302,7 +302,7 @@
ack_bean = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(ack_bean, env, key);
SANDESHA2_SENDER_BEAN_SET_MSG_ID(ack_bean, env,
- AXIS2_MSG_CTX_GET_MSG_ID(ack_msg_ctx, env));
+ (axis2_char_t*)AXIS2_MSG_CTX_GET_MSG_ID(ack_msg_ctx, env));
SANDESHA2_SENDER_BEAN_SET_RESEND(ack_bean, env, AXIS2_FALSE);
SANDESHA2_SENDER_BEAN_SET_SEQ_ID(ack_bean, env, seq_id);
SANDESHA2_SENDER_BEAN_SET_SEND(ack_bean, env, AXIS2_TRUE);
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=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Sep 6 22:03:42 2006
@@ -622,7 +622,7 @@
axis2_char_t *seq_key = NULL;
axis2_char_t *last_app_msg = NULL;
- to = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
SANDESHA2_CLIENT_SEQ_KEY, AXIS2_FALSE);
if(NULL != property)
@@ -827,7 +827,8 @@
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR,AXIS2_FALSE);
acks_to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);
- acks_to = AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to_epr, env);
+ acks_to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ acks_to_epr, env);
/*axis2_msg_ctx_t *req_msg_ctx = NULL;
req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(AXIS2_MSG_CTX_GET_OP_CTX(
msg_ctx, env), env, AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE);
@@ -862,7 +863,8 @@
SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(reply_to_epr_bean,
env));
if(NULL != acks_epr)
- acks_to = AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_epr, env);
+ acks_to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ acks_epr, env);
}
}
/**
@@ -935,7 +937,7 @@
op_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_OP_GET_QNAME(AXIS2_OP_CTX_GET_OP(
AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env), env), env),
env);
- to_addr = AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
+ to_addr = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env);
if(NULL == AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env))
AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, axis2_strcat(env, to_addr,
"/", op_name, NULL));
@@ -1095,7 +1097,7 @@
AXIS2_MSG_CTX_SET_RELATES_TO(create_seq_msg, env, NULL);
create_seq_bean = sandesha2_create_seq_bean_create_with_data(env,
- internal_seq_id, AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
+ internal_seq_id, (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
create_seq_msg, env), NULL);
SANDESHA2_CREATE_SEQ_MGR_INSERT(create_seq_man, env,
create_seq_bean);
@@ -1183,7 +1185,6 @@
axis2_endpoint_ref_t *to_epr = NULL;
axis2_endpoint_ref_t *reply_to_epr = NULL;
axis2_char_t *new_to_str = NULL;
- sandesha2_msg_ctx_t *req_rm_msg = NULL;
sandesha2_seq_t *seq = NULL;
sandesha2_seq_t *req_seq = NULL;
axis2_char_t *rm_version = NULL;
@@ -1239,7 +1240,8 @@
reply_to = AXIS2_MSG_CTX_GET_REPLY_TO(req_msg, env);*/
reply_to = AXIS2_MSG_CTX_GET_TO(app_msg_ctx, env);
if(reply_to)
- new_to_str = AXIS2_ENDPOINT_REF_GET_ADDRESS(reply_to, env);
+ new_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ reply_to, env);
}
if(NULL != new_to_str)
SANDESHA2_MSG_CTX_SET_TO(rm_msg_ctx, env, axis2_endpoint_ref_create(env,
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Wed Sep 6 22:03:42 2006
@@ -293,7 +293,7 @@
}
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env,
new_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR,
- AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env));
+ (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env));
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, acks_to_bean);
AXIS2_MSG_CTX_SET_RESPONSE_WRITTEN(out_msg_ctx, env, AXIS2_TRUE);
sandesha2_seq_mgr_update_last_activated_time(env, new_seq_id,
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Wed Sep 6 22:03:42 2006
@@ -307,7 +307,8 @@
SANDESHA2_SEQ_PROPERTY_BEAN_SET_SEQ_ID(acks_to_bean, env,
offered_seq_id);
SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(acks_to_bean, env,
- AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to_epr, env));
+ (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ acks_to_epr, env));
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, acks_to_bean);
next_bean = sandesha2_next_msg_bean_create(env);
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=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Wed Sep 6 22:03:42 2006
@@ -464,8 +464,8 @@
storage_man = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR(storage_man, env);
- to_address = AXIS2_ENDPOINT_REF_GET_ADDRESS(AXIS2_MSG_CTX_GET_TO(msg_ctx,
- env), env);
+ to_address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ AXIS2_MSG_CTX_GET_TO(msg_ctx, env), env);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, SANDESHA2_CLIENT_SEQ_KEY,
AXIS2_FALSE);
seq_key = AXIS2_PROPERTY_GET_VALUE(property, env);
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?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/sender_mgr.c Wed Sep 6 22:03:42 2006
@@ -270,7 +270,6 @@
{
sandesha2_sender_mgr_impl_t *sender_impl = NULL;
sandesha2_sender_bean_t *bean = NULL;
- axis2_hash_index_t *ind = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_id, AXIS2_FALSE);
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/storage_mgr.c Wed Sep 6 22:03:42 2006
@@ -49,7 +49,6 @@
sandesha2_seq_property_mgr_t *seq_property_mgr;
sandesha2_sender_mgr_t *sender_mgr;
sandesha2_invoker_mgr_t *invoker_mgr;
-
axis2_conf_ctx_t *conf_ctx;
};
@@ -251,7 +250,7 @@
if(storage_impl->instance)
{
- axis2_thread_mutex_destroy(storage_impl->instance);
+ sandesha2_storage_mgr_free(storage_impl->instance, env);
storage_impl->instance = NULL;
}
if(storage_impl->create_seq_mgr)
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=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Wed Sep 6 22:03:42 2006
@@ -46,7 +46,6 @@
axis2_op_t *ack_op = NULL;
axis2_op_t *ref_op = NULL;
axis2_msg_ctx_t *ack_msg_ctx = NULL;
- axis2_char_t *wsa_version = NULL;
axis2_char_t *addr_ns_uri = NULL;
axis2_char_t *anon_uri = NULL;
axis2_property_t *property = NULL;
@@ -67,7 +66,7 @@
SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(acks_to_bean,
env));
if(NULL != acks_to)
- acks_to_str = AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env);
+ acks_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env);
if(NULL == acks_to_str)
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_INVALID_EPR, AXIS2_FAILURE);
@@ -184,7 +183,8 @@
ack_bean = sandesha2_sender_bean_create(env);
SANDESHA2_SENDER_BEAN_SET_MSG_CONTEXT_REF_KEY(ack_bean, env, key);
SANDESHA2_SENDER_BEAN_SET_MSG_ID(ack_bean, env,
- AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(ack_msg_ctx, env));
+ (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_MESSAGE_ID(
+ ack_msg_ctx, env));
SANDESHA2_SENDER_BEAN_SET_RESEND(ack_bean, env, AXIS2_FALSE);
SANDESHA2_SENDER_BEAN_SET_SEQ_ID(ack_bean, env, seq_id);
SANDESHA2_SENDER_BEAN_SET_SEND(ack_bean, env, AXIS2_TRUE);
@@ -416,7 +416,7 @@
to = SANDESHA2_MSG_CTX_GET_TO(rm_msg_ctx, env);
if(to)
- to_str = AXIS2_ENDPOINT_REF_GET_ADDRESS(to, env);
+ 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);
@@ -439,8 +439,8 @@
msg_ctx1 = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_mgr, env,
SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
sender_bean, env), conf_ctx);
- to = AXIS2_ENDPOINT_REF_GET_ADDRESS(AXIS2_MSG_CTX_GET_TO(msg_ctx1,
- env), env);
+ to = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ AXIS2_MSG_CTX_GET_TO(msg_ctx1, env), env);
if(0 == AXIS2_STRCMP(to, to_str))
continue;
SANDESHA2_SENDER_MGR_REMOVE(retrans_mgr, env,
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Wed Sep 6 22:03:42 2006
@@ -582,7 +582,7 @@
epr = SANDESHA2_ADDRESS_GET_EPR(SANDESHA2_ACKS_TO_GET_ADDRESS(
SANDESHA2_CREATE_SEQ_GET_ACKS_TO(create_seq, env),
env), env);
- acks_to_str = AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
+ acks_to_str = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
}
else
{
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Wed Sep 6 22:03:42 2006
@@ -456,7 +456,6 @@
axis2_op_t *terminate_seq_op = NULL;
axis2_op_t *ref_msg_op = NULL;
axis2_op_ctx_t *terminate_seq_op_ctx = NULL;
- axis2_ctx_t *ctx = NULL;
axis2_char_t *terminate_seq_msg_id = NULL;
axis2_char_t *temp_msg_id = NULL;
axis2_char_t *rm_version = NULL;
@@ -491,7 +490,8 @@
terminate_seq_msg_ctx = sandesha2_utils_create_new_related_msg_ctx(env,
ref_rm_msg, terminate_seq_op);
terminate_seq_op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(terminate_seq_msg_ctx, env);
- terminate_seq_msg_id = AXIS2_MSG_CTX_GET_MSG_ID(terminate_seq_msg_ctx, env);
+ terminate_seq_msg_id = (axis2_char_t*)AXIS2_MSG_CTX_GET_MSG_ID(
+ terminate_seq_msg_ctx, env);
if(terminate_seq_msg_id)
AXIS2_CONF_CTX_REGISTER_OP_CTX(conf_ctx, env, terminate_seq_msg_id,
terminate_seq_op_ctx);
Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Wed Sep 6 22:03:42 2006
@@ -139,7 +139,7 @@
}
elements = sandesha2_rm_elements_create(env, addressing_ns);
envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
- action = AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
+ action = (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
SANDESHA2_RM_ELEMENTS_FROM_SOAP_ENVELOPE(elements, env, envelope, action);
create_seq = SANDESHA2_RM_ELEMENTS_GET_CREATE_SEQ(elements, env);
if(create_seq)
@@ -432,7 +432,7 @@
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
- return AXIS2_FAILURE;
+ return;
}
op = axis2_op_create_with_qname(env, tmp_qname);
AXIS2_QNAME_FREE(tmp_qname, env);
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?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed Sep 6 22:03:42 2006
@@ -559,7 +559,6 @@
axis2_char_t *addr_ver = NULL;
axis2_char_t *paused_phase_name = NULL;
axis2_svc_grp_t *svc_grp = NULL;
- axis2_endpoint_ref_t *to = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, ref_rm_msg, NULL);
@@ -717,7 +716,8 @@
property, AXIS2_FALSE);
AXIS2_MSG_CTX_SET_EXECUTION_CHAIN(new_msg, env,
AXIS2_MSG_CTX_GET_EXECUTION_CHAIN(ref_msg, env));
- paused_phase_name = AXIS2_MSG_CTX_GET_PAUSED_PHASE_NAME(ref_msg, env);
+ paused_phase_name = (axis2_char_t*)AXIS2_MSG_CTX_GET_PAUSED_PHASE_NAME(
+ ref_msg, env);
AXIS2_MSG_CTX_SET_PAUSED_PHASE_NAME(new_msg, env, paused_phase_name);
return new_msg;
@@ -773,7 +773,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FALSE);
- action = AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
+ action = (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
if(NULL == action)
return AXIS2_FALSE;
@@ -802,7 +802,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FALSE);
- action = AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
+ action = (axis2_char_t*)AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
printf("action:%s\n", action);
soap_env = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Wed Sep 6 22:03:42 2006
@@ -125,7 +125,7 @@
/* If no replyTo value. Send responses as sync. */
if(reply_to)
{
- address = AXIS2_ENDPOINT_REF_GET_ADDRESS(reply_to, env);
+ address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(reply_to, env);
to_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_TO_EPR, address);
}
@@ -134,10 +134,10 @@
to_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_TO_EPR, anonymous_uri);
}
- address = AXIS2_ENDPOINT_REF_GET_ADDRESS(to, env);
+ address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to, env);
reply_to_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_REPLY_TO_EPR, address);
- address = AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env);
+ address = (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(acks_to, env);
acks_to_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
SANDESHA2_SEQ_PROP_ACKS_TO_EPR, address);
SANDESHA2_SEQ_PROPERTY_MGR_INSERT(seq_prop_mgr, env, received_msg_bean);
@@ -373,12 +373,12 @@
to_bean = sandesha2_seq_property_bean_create_with_data(env, int_seq_id,
SANDESHA2_SEQ_PROP_TO_EPR,
- AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr, env));
+ (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(to_epr,
+ env));
if(AXIS2_TRUE == AXIS2_MSG_CTX_GET_SERVER_SIDE(first_app_msg, env))
{
axis2_op_ctx_t *op_ctx = NULL;
- axis2_msg_ctx_t *req_msg_ctx = NULL;
axis2_endpoint_ref_t *reply_to_epr = NULL;
axis2_property_t *property = NULL;
@@ -399,7 +399,8 @@
if(NULL != reply_to_epr)
reply_to_bean = sandesha2_seq_property_bean_create_with_data(env,
int_seq_id, SANDESHA2_SEQ_PROP_REPLY_TO_EPR,
- AXIS2_ENDPOINT_REF_GET_ADDRESS(reply_to_epr, env));
+ (axis2_char_t*)AXIS2_ENDPOINT_REF_GET_ADDRESS(
+ reply_to_epr, env));
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot get"
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=440976&r1=440975&r2=440976
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Wed Sep 6 22:03:42 2006
@@ -244,7 +244,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
sender_impl = SANDESHA2_INTF_TO_IMPL(sender);
- sender_impl->run_sender;
+ return sender_impl->run_sender;
}
axis2_status_t AXIS2_CALL
@@ -338,7 +338,6 @@
if(NULL != req_op_ctx)
{
axis2_ctx_t *ctx = NULL;
- axis2_endpoint_ref_t *to = NULL;
ctx = AXIS2_OP_CTX_GET_BASE(req_op_ctx, env);
if(NULL != AXIS2_CTX_GET_PROPERTY(ctx, env, MTOM_RECIVED_CONTENT_TYPE,
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org