You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2007/02/16 06:00:01 UTC
svn commit: r508313 - in /webservices/sandesha/trunk/c: include/
samples/rm_echo_single_1_0/ src/msgprocessors/ src/util/ src/workers/
Author: damitha
Date: Thu Feb 15 21:00:00 2007
New Revision: 508313
URL: http://svn.apache.org/viewvc?view=rev&rev=508313
Log:
Fixed SANDESHA2C-20. Now in two way single channel with RM 1.0 server
side send the terminate message to the client. The reason I found was
that in app_msg_processor's process_out_msg() function the code where
the last_msg is set is not reached in the server side. That's because
the SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_ID property is not set while
in the in path. Consequetly in the same function SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO
is not set. As a result in server side ack_msg_processor's process_in_msg function
the code is not reached to sandesha2_terminate_mgr_add_terminate_seq_msg function.
Modified:
webservices/sandesha/trunk/c/include/sandesha2_sender_worker.h
webservices/sandesha/trunk/c/samples/rm_echo_single_1_0/rm_echo_single.c
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/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c
webservices/sandesha/trunk/c/src/util/spec_specific_consts.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_sender_worker.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_sender_worker.h?view=diff&rev=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_sender_worker.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_sender_worker.h Thu Feb 15 21:00:00 2007
@@ -98,6 +98,11 @@
sandesha2_sender_worker_t *sender_worker,
const axis2_env_t *env,
axis2_transport_out_desc_t *transport_out);
+
+axis2_status_t AXIS2_CALL
+sandesha2_sender_worker_check_for_sync_res(
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
/** @} */
#ifdef __cplusplus
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=508313&r1=508312&r2=508313
==============================================================================
--- 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 Thu Feb 15 21:00:00 2007
@@ -201,7 +201,6 @@
payload = NULL;
AXIS2_SLEEP(3 * SANDESHA2_MAX_COUNT);
- sleep(30);
if (svc_client)
{
/*AXIS2_SVC_CLIENT_FREE(svc_client, env);*/
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?view=diff&rev=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Thu Feb 15 21:00:00 2007
@@ -343,13 +343,13 @@
ack_range_list, highest_out_msg_no);
if(completed)
{
- sandesha2_terminate_mgr_add_terminate_seq_msg(env, rm_msg_ctx,
- out_seq_id, int_seq_id, storage_mgr);
+ sandesha2_terminate_mgr_add_terminate_seq_msg(env,
+ rm_msg_ctx, out_seq_id, int_seq_id, storage_mgr);
}
}
}
action = AXIS2_MSG_CTX_GET_WSA_ACTION(msg_ctx, env);
- if(action && 0 == AXIS2_STRCMP(action,
+ if(action && 0 == axis2_strcmp(action,
sandesha2_spec_specific_consts_get_ack_req_action(env,
sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env))))
{
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=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Thu Feb 15 21:00:00 2007
@@ -424,7 +424,7 @@
axis2_array_list_t *incoming_seq_list = NULL;
axis2_char_t *str_value = NULL;
axis2_property_t *property = NULL;
-
+
incoming_seq_list_bean = sandesha2_seq_property_mgr_retrieve(
seq_prop_mgr, env, SANDESHA2_SEQ_PROP_ALL_SEQS,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
@@ -511,6 +511,20 @@
sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
storage_mgr);
}
+ /* test code */
+ if(axis2_msg_ctx_get_server_side(msg_ctx, env))
+ {
+ sandesha2_last_msg_t *last_msg = sandesha2_seq_get_last_msg(seq, env);
+ axis2_char_t *msg_id = axis2_msg_ctx_get_msg_id(msg_ctx, env);
+ if(last_msg)
+ {
+ sandesha2_seq_property_bean_t *seq_prop_bean = NULL;
+ seq_prop_bean = sandesha2_seq_property_bean_create_with_data(
+ env, str_seq_id, SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_ID, msg_id);
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, seq_prop_bean);
+ }
+ }
+ /* end test code */
AXIS2_LOG_INFO(env->log,
"[sandesha2] Exit: sandesha2_app_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
@@ -626,7 +640,10 @@
*/
last_req_id = sandesha2_utils_get_seq_property(env, incoming_seq_id,
SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_ID, storage_mgr);
+ printf("last_req_id:%s\n", last_req_id);
relates_to = axis2_msg_ctx_get_relates_to(msg_ctx, env);
+ relates_to_value = axis2_relates_to_get_value(relates_to, env);
+ printf("relates_to_value:%s\n", relates_to_value);
if(relates_to && last_req_id && 0 == axis2_strcmp(last_req_id,
relates_to_value))
{
@@ -738,6 +755,8 @@
res_highest_msg_key_bean = sandesha2_seq_property_bean_create_with_data(
env, internal_seq_id, SANDESHA2_SEQ_PROP_HIGHEST_OUT_MSG_KEY,
storage_key);
+ printf("internal_seq_id:%s\n", internal_seq_id);
+ printf("msg_number_str:%s\n", msg_number_str);
res_last_msg_key_bean = sandesha2_seq_property_bean_create_with_data(
env, internal_seq_id, SANDESHA2_SEQ_PROP_LAST_OUT_MESSAGE_NO,
msg_number_str);
@@ -980,6 +999,7 @@
sandesha2_msg_ctx_t *ack_rm_msg = NULL;
axis2_engine_t *engine = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
+ axis2_bool_t sent = AXIS2_FALSE;
AXIS2_LOG_INFO(env->log,
"[Sandesha2] sandesha2_app_msg_processor_send_ack_if_reqd");
@@ -1012,7 +1032,8 @@
storage_mgr);
engine = axis2_engine_create(env, conf_ctx);
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(ack_rm_msg, env);
- if(!AXIS2_ENGINE_SEND(engine, env, msg_ctx))
+ sent = AXIS2_ENGINE_SEND(engine, env, msg_ctx);
+ if(!sent)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[Sandesha2]Engine Send failed");
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=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Thu Feb 15 21:00:00 2007
@@ -208,7 +208,7 @@
storage_mgr);
create_seq_res_msg = sandesha2_msg_creator_create_create_seq_res_msg(env,
rm_msg_ctx, out_msg_ctx, new_seq_id, storage_mgr);
- AXIS2_MSG_CTX_SET_FLOW(out_msg_ctx, env, AXIS2_OUT_FLOW);
+ axis2_msg_ctx_set_flow(out_msg_ctx, env, AXIS2_OUT_FLOW);
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
@@ -311,7 +311,7 @@
new_seq_id, SANDESHA2_SEQ_PROP_ACKS_TO_EPR,
(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);
+ axis2_msg_ctx_set_response_written(out_msg_ctx, env, AXIS2_TRUE);
sandesha2_seq_mgr_update_last_activated_time(env, new_seq_id,
storage_mgr);
engine = axis2_engine_create(env, conf_ctx);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?view=diff&rev=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Thu Feb 15 21:00:00 2007
@@ -261,7 +261,7 @@
{
return AXIS2_SUCCESS;
}
- transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
+ transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx, env);
if(!transport_out)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2]"
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=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/terminate_seq_msg_processor.c Thu Feb 15 21:00:00 2007
@@ -173,16 +173,17 @@
sandesha2_seq_property_bean_t *term_rcvd_bean = NULL;
sandesha2_seq_property_bean_t *transmit_bean = NULL;
axis2_char_t *spec_version = NULL;
-
+
+ printf("came10\n");
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_in_msg .........");
+ "[sandesha2] sandesha2_terminate_msg_processor_process_in_msg .........");
msg_ctx = sandesha2_msg_ctx_get_msg_ctx(rm_msg_ctx, env);
seq_ack = (sandesha2_seq_ack_t*)sandesha2_msg_ctx_get_msg_part(
- rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
+ rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
if(seq_ack)
{
@@ -191,35 +192,35 @@
sandesha2_msg_processor_process_in_msg(ack_processor, env, rm_msg_ctx);
}
term_seq = (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);
if(!term_seq)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Terminate "
- "Sequence part is not available");
+ "Sequence part is not available");
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_REQD_MSG_PART_MISSING,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
seq_id = sandesha2_identifier_get_identifier(
- sandesha2_terminate_seq_get_identifier(term_seq, env), env);
+ sandesha2_terminate_seq_get_identifier(term_seq, env), env);
if(!seq_id || 0 == AXIS2_STRLEN(seq_id))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Invalid "
- "sequence id");
+ "sequence id");
return AXIS2_FAILURE;
}
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));
fault_ctx = sandesha2_fault_mgr_check_for_unknown_seq(env,
- rm_msg_ctx, seq_id, storage_mgr);
+ rm_msg_ctx, seq_id, storage_mgr);
if(fault_ctx)
{
axis2_engine_t *engine = NULL;
engine = axis2_engine_create(env, conf_ctx);
AXIS2_ENGINE_SEND_FAULT(engine, env, sandesha2_msg_ctx_get_msg_ctx(
- fault_ctx, env));
+ fault_ctx, env));
AXIS2_MSG_CTX_SET_PAUSED(msg_ctx, env, AXIS2_TRUE);
return AXIS2_SUCCESS;
}
@@ -227,28 +228,28 @@
term_rcvd_bean = sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_seq_id(term_rcvd_bean, env, seq_id);
sandesha2_seq_property_bean_set_name(term_rcvd_bean, env,
- SANDESHA2_SEQ_PROP_TERMINATE_RECEIVED);
+ SANDESHA2_SEQ_PROP_TERMINATE_RECEIVED);
sandesha2_seq_property_bean_set_value(term_rcvd_bean, env,
- SANDESHA2_VALUE_TRUE);
+ SANDESHA2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, term_rcvd_bean);
spec_version = sandesha2_msg_ctx_get_rm_spec_ver(rm_msg_ctx, env);
if(AXIS2_TRUE == sandesha2_spec_specific_consts_is_term_seq_res_reqd(env,
- spec_version))
+ spec_version))
sandesha2_terminate_seq_msg_processor_add_terminate_seq_res(env,
- rm_msg_ctx, seq_id, storage_mgr);
+ rm_msg_ctx, seq_id, storage_mgr);
sandesha2_terminate_seq_msg_processor_setup_highest_msg_nums(env, conf_ctx,
- storage_mgr, seq_id, rm_msg_ctx);
+ storage_mgr, seq_id, rm_msg_ctx);
sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg(env, conf_ctx,
- seq_id, storage_mgr);
+ seq_id, storage_mgr);
transmit_bean = sandesha2_seq_property_bean_create_with_data(env, seq_id,
- SANDESHA2_SEQ_PROP_SEQ_TERMINATED, SANDESHA2_VALUE_TRUE);
+ SANDESHA2_SEQ_PROP_SEQ_TERMINATED, SANDESHA2_VALUE_TRUE);
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, transmit_bean);
sandesha2_seq_mgr_update_last_activated_time(env, seq_id, storage_mgr);
sandesha2_msg_ctx_set_paused(rm_msg_ctx, env, AXIS2_TRUE);
AXIS2_LOG_INFO(env->log,
- "[sandesha2] Exit: sandesha2_terminate_msg_processor_process_in_msg");
+ "[sandesha2] Exit: sandesha2_terminate_msg_processor_process_in_msg");
return AXIS2_SUCCESS;
}
@@ -303,10 +304,13 @@
axis2_char_t *in_msg_id = highest_in_msg_id;
sandesha2_seq_property_bean_t *last_in_msg_bean = NULL;
axis2_char_t *highest_out_relates_to = NULL;
-
last_in_msg_bean = sandesha2_seq_property_bean_create_with_data(env,
seq_id, SANDESHA2_SEQ_PROP_LAST_IN_MESSAGE_ID, highest_in_msg_id);
- sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, last_in_msg_bean);
+ if(last_in_msg_bean)
+ {
+ printf("came20\n");
+ sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, last_in_msg_bean);
+ }
/* If an outbound message has already gone out with that relatesTo, then
* we can terminate right away.
*/
Modified: webservices/sandesha/trunk/c/src/util/spec_specific_consts.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/spec_specific_consts.c?view=diff&rev=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/src/util/spec_specific_consts.c (original)
+++ webservices/sandesha/trunk/c/src/util/spec_specific_consts.c Thu Feb 15 21:00:00 2007
@@ -28,11 +28,11 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, ns_val, NULL);
- if(0 == AXIS2_STRCMP(ns_val, SANDESHA2_SPEC_2005_02_NS_URI))
+ if(0 == axis2_strcmp(ns_val, SANDESHA2_SPEC_2005_02_NS_URI))
{
return SANDESHA2_SPEC_VERSION_1_0;
}
- else if(0 == AXIS2_STRCMP(ns_val, SANDESHA2_SPEC_2006_08_NS_URI))
+ else if(0 == axis2_strcmp(ns_val, SANDESHA2_SPEC_2006_08_NS_URI))
{
return SANDESHA2_SPEC_VERSION_1_1;
}
@@ -52,11 +52,11 @@
{
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, spec_ver, NULL);
- if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_ver))
+ if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_ver))
{
return SANDESHA2_SPEC_2005_02_NS_URI;
}
- if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_ver))
+ if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_ver))
{
return SANDESHA2_SPEC_2006_08_NS_URI;
}
@@ -70,11 +70,11 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_spec_ver, AXIS2_FAILURE);
- if(0 == AXIS2_STRCMP(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_0))
+ if(0 == axis2_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_0))
{
return AXIS2_FALSE;
}
- else if(0 == AXIS2_STRCMP(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_1))
+ else if(0 == axis2_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_1))
{
return AXIS2_TRUE;
}
@@ -93,11 +93,11 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_spec_ver, AXIS2_FAILURE);
- if(0 == AXIS2_STRCMP(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_0))
+ if(0 == axis2_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_0))
{
return AXIS2_FALSE;
}
- else if(0 == AXIS2_STRCMP(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_1))
+ else if(0 == axis2_strcmp(rm_spec_ver, SANDESHA2_SPEC_VERSION_1_1))
{
return AXIS2_TRUE;
}
@@ -122,9 +122,9 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
return SANDESHA2_SPEC_2005_02_ACTION_TERMINATE_SEQ;
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -137,11 +137,11 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ;
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -154,11 +154,11 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return SANDESHA2_SPEC_2005_02_ACTION_CREATE_SEQ_RESPONSE;
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_CREATE_SEQ_RESPONSE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -171,13 +171,13 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_RM_SPEC_VERSION_DOES_NOT_DEFINE_A_SEQ_CLOSE_ACTION,
AXIS2_FAILURE);
return NULL;
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -190,13 +190,13 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_RM_SPEC_VERSION_DOES_NOT_DEFINE_A_SEQ_CLOSE_ACTION,
AXIS2_FAILURE);
return NULL;
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_CLOSE_SEQ_RESPONSE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -207,21 +207,21 @@
axis2_char_t *AXIS2_CALL
sandesha2_spec_specific_consts_get_ack_req_action(
- const axis2_env_t *env,
- axis2_char_t *spec_version)
+ const axis2_env_t *env,
+ axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error,
- SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_ACTION,
- AXIS2_FAILURE);
+ SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_ACTION,
+ AXIS2_FAILURE);
return NULL;
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_ACK_REQUEST;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
@@ -232,9 +232,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, addr_ns_val, NULL);
- if(0 == AXIS2_STRCMP(AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns_val))
+ if(0 == axis2_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, addr_ns_val))
return AXIS2_WSA_ANONYMOUS_URL_SUBMISSION;
- else if(0 == AXIS2_STRCMP(AXIS2_WSA_NAMESPACE, addr_ns_val))
+ else if(0 == axis2_strcmp(AXIS2_WSA_NAMESPACE, addr_ns_val))
return AXIS2_WSA_ANONYMOUS_URL;
return NULL;
@@ -245,11 +245,11 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return AXIS2_FALSE;
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return AXIS2_TRUE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -265,9 +265,9 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, spec_version, NULL);
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
return SANDESHA2_SPEC_2005_02_SOAP_ACTION_TERMINATE_SEQ;
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_SOAP_ACTION_TERMINATE_SEQ;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -280,14 +280,14 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_SPEC_VERSION_DOES_NOT_DEFINE_A_ACK_REQUEST_SOAP_ACTION,
AXIS2_FAILURE);
return NULL;
}
- else if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
{
return SANDESHA2_SPEC_2006_08_SOAP_ACTION_ACK_REQUEST;
}
@@ -307,9 +307,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, spec_version, AXIS2_FALSE);
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
return AXIS2_FALSE;
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return AXIS2_TRUE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -326,7 +326,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, spec_version, NULL);
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_TERMINATE_SEQ_RESPONSE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -340,11 +340,11 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return SANDESHA2_SPEC_2005_02_ACTION_SEQ_ACKNOWLEDGEMENT;
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_SEQ_ACKNOWLEDGEMENT;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -357,11 +357,11 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return SANDESHA2_SPEC_2005_02_SOAP_ACTION_SEQ_ACKNOWLEDGEMENT;
}
- else if(0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if(0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
{
return SANDESHA2_SPEC_2006_08_SOAP_ACTION_SEQ_ACKNOWLEDGEMENT;
}
@@ -378,13 +378,13 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
AXIS2_ERROR_SET(env->error,
SANDESHA2_ERROR_MAKE_CONNECTION_IS_NOT_SUPPORTED_IN_THIS_RM_VERSION,
AXIS2_FAILURE);
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return SANDESHA2_SPEC_2006_08_ACTION_MAKE_CONNECTION;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
@@ -397,11 +397,11 @@
const axis2_env_t *env,
axis2_char_t *spec_version)
{
- if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, spec_version))
+ if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_0, spec_version))
{
return AXIS2_TRUE;
}
- else if (0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_1, spec_version))
+ else if (0 == axis2_strcmp(SANDESHA2_SPEC_VERSION_1_1, spec_version))
return AXIS2_FALSE;
else
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_SPEC_ERROR_MESSAGE,
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=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Thu Feb 15 21:00:00 2007
@@ -26,6 +26,7 @@
#include <sandesha2_seq_property_mgr.h>
#include <sandesha2_create_seq_mgr.h>
#include <sandesha2_sender_mgr.h>
+#include <sandesha2_sender_worker.h>
#include <sandesha2_sender_bean.h>
#include <axis2_string.h>
#include <axis2_uuid_gen.h>
@@ -608,6 +609,7 @@
axis2_engine_t *engine = NULL;
axis2_char_t *temp_action = NULL;
axis2_string_t *soap_action = NULL;
+ const axis2_char_t *to_addr = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
@@ -645,7 +647,7 @@
"invalid value");
return AXIS2_FAILURE;
}
- /*sandesha2_msg_ctx_set_to(rm_msg_ctx, env, to_epr);*/
+ to_addr = axis2_endpoint_ref_get_address(to_epr, env);
sandesha2_msg_ctx_set_to(terminate_rm_msg, env, to_epr);
rm_ver = sandesha2_utils_get_rm_version(env, int_seq_id, storage_mgr);
if(!rm_ver)
@@ -673,12 +675,32 @@
}
sandesha2_msg_ctx_add_soap_envelope(terminate_rm_msg, env);
-
+ if(axis2_msg_ctx_get_server_side(msg_ctx, env) &&
+ sandesha2_utils_is_single_channel(env, rm_ver, to_addr))
+ {
+ axis2_msg_ctx_t *msg_ctx1 = sandesha2_msg_ctx_get_msg_ctx(terminate_rm_msg, env);
+ axis2_ctx_t *ctx = NULL;
+ axis2_property_t *property = NULL;
+ axis2_msg_ctx_set_response_written(msg_ctx1, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_TRUE);
+ ctx = axis2_op_ctx_get_base(axis2_msg_ctx_get_op_ctx(msg_ctx, env), env);
+ property = axis2_property_create_with_args(env, 0, 0, 0, "TRUE");
+ axis2_ctx_set_property(ctx, env, AXIS2_RESPONSE_WRITTEN, property,
+ AXIS2_FALSE);
+ engine = axis2_engine_create(env, conf_ctx);
+
+ /*property = axis2_property_create_with_args(env, 0, 0, 0, to_addr);
+ axis2_msg_ctx_set_property(msg_ctx1, env, AXIS2_TRANSPORT_URL, property,
+ AXIS2_FALSE);
+ axis2_msg_ctx_set_to(msg_ctx1, env, to_epr);*/
+
+ AXIS2_ENGINE_SEND(engine, env, msg_ctx1);
+ return AXIS2_SUCCESS;
+ }
key = axis2_uuid_gen(env);
terminate_bean = sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_ctx_ref_key(terminate_bean, env, key);
terminate_msg_ctx = sandesha2_msg_ctx_get_msg_ctx(terminate_rm_msg, env);
- /*AXIS2_MSG_CTX_SET_KEEP_ALIVE(terminate_msg_ctx, env, AXIS2_TRUE);*/
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env, key,
terminate_msg_ctx);
sandesha2_sender_bean_set_time_to_send(terminate_bean, env,
@@ -707,7 +729,7 @@
sandesha2_seq_property_mgr_insert(seq_prop_mgr, env, terminate_added);
msg_ctx1 = sandesha2_msg_ctx_get_msg_ctx(terminate_rm_msg, env);
- transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx1, env);
+ transport_out = axis2_msg_ctx_get_transport_out_desc(msg_ctx1, env);
property = axis2_property_create_with_args(env, 0, 0,
transport_out->ops->free_void_arg, transport_out);
@@ -728,7 +750,6 @@
sandesha2_utils_get_transport_out(env));
engine = axis2_engine_create(env, conf_ctx);
-
return AXIS2_ENGINE_SEND(engine, env, msg_ctx1);
}
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=508313&r1=508312&r2=508313
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Thu Feb 15 21:00:00 2007
@@ -83,15 +83,13 @@
const axis2_env_t *env,
sandesha2_msg_ctx_t *rm_msg_ctx);
-static axis2_status_t AXIS2_CALL
+/*axis2_status_t AXIS2_CALL
sandesha2_sender_worker_check_for_sync_res(
- sandesha2_sender_worker_t *sender_worker,
const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+ axis2_msg_ctx_t *msg_ctx);*/
static axis2_bool_t AXIS2_CALL
sandesha2_sender_worker_is_fault_envelope(
- sandesha2_sender_worker_t *sender_worker,
const axis2_env_t *env,
axiom_soap_envelope_t *soap_envelope);
@@ -294,7 +292,7 @@
"not present in the store");
return NULL;
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
@@ -302,7 +300,7 @@
{
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION,
+ axis2_msg_ctx_set_property(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION,
property, AXIS2_FALSE);
}
continue_sending = sandesha2_msg_retrans_adjuster_adjust_retrans(env,
@@ -316,7 +314,7 @@
return NULL;
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_QUALIFIED_FOR_SENDING, AXIS2_FALSE);
if(property)
qualified_for_sending = AXIS2_PROPERTY_GET_VALUE(property, env);
@@ -397,7 +395,7 @@
if(transport_sender)
{
sandesha2_transaction_commit(transaction, env);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE);
@@ -405,7 +403,7 @@
{
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
+ axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
}
/* Consider building soap envelope */
@@ -418,7 +416,7 @@
}
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE);
@@ -426,7 +424,7 @@
{
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
+ axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
}
msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
@@ -461,9 +459,8 @@
}
if(successfully_sent)
{
- if(AXIS2_FALSE == AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
- sandesha2_sender_worker_check_for_sync_res(sender_worker, env,
- msg_ctx);
+ if(AXIS2_FALSE == axis2_msg_ctx_get_server_side(msg_ctx, env))
+ sandesha2_sender_worker_check_for_sync_res(env, msg_ctx);
}
msg_type = sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env);
if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ == msg_type)
@@ -483,7 +480,7 @@
internal_seq_id = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr);
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
- internal_seq_id, AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env),
+ internal_seq_id, axis2_msg_ctx_get_server_side(msg_ctx, env),
storage_mgr);
}
else if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ_RESPONSE == msg_type)
@@ -500,10 +497,10 @@
env), env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
sandesha2_terminate_mgr_terminate_sending_side(env, conf_ctx,
- seq_id, AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env),
+ seq_id, axis2_msg_ctx_get_server_side(msg_ctx, env),
storage_mgr);
}
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE);
@@ -511,7 +508,7 @@
{
property = axis2_property_create_with_args(env, 0, 0, 0,
SANDESHA2_VALUE_FALSE);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
+ axis2_msg_ctx_set_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
}
/* TODO make transaction handling effective */
@@ -556,9 +553,8 @@
return AXIS2_FALSE;
}
-static axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
sandesha2_sender_worker_check_for_sync_res(
- sandesha2_sender_worker_t *sender_worker,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx)
{
@@ -571,26 +567,26 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN,
- AXIS2_FALSE);
+ property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_TRANSPORT_IN,
+ AXIS2_FALSE);
if(!property)
return AXIS2_SUCCESS;
res_msg_ctx = axis2_msg_ctx_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx,
- env), AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(
- msg_ctx, env), AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx,
- env));
+ env), AXIS2_MSG_CTX_GET_TRANSPORT_IN_DESC(
+ msg_ctx, env), AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx,
+ env));
/* Setting the message as serverSide will let it go through the
- * MessageReceiver (may be callback MR).
+ * Message Receiver (may be callback MR).
*/
AXIS2_MSG_CTX_SET_SERVER_SIDE(res_msg_ctx, env, AXIS2_TRUE);
- AXIS2_MSG_CTX_SET_PROPERTY(res_msg_ctx, env, AXIS2_TRANSPORT_IN,
- AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN,
- AXIS2_FALSE), AXIS2_FALSE);
+ axis2_msg_ctx_set_property(res_msg_ctx, env, AXIS2_TRANSPORT_IN,
+ axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_TRANSPORT_IN,
+ AXIS2_FALSE), AXIS2_FALSE);
AXIS2_MSG_CTX_SET_SVC_CTX(res_msg_ctx, env, AXIS2_MSG_CTX_GET_SVC_CTX(
- msg_ctx, env));
+ msg_ctx, env));
AXIS2_MSG_CTX_SET_SVC_GRP_CTX(res_msg_ctx, env,
- AXIS2_MSG_CTX_GET_SVC_GRP_CTX(msg_ctx, env));
+ AXIS2_MSG_CTX_GET_SVC_GRP_CTX(msg_ctx, env));
req_op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
if(req_op_ctx)
{
@@ -598,35 +594,35 @@
ctx = AXIS2_OP_CTX_GET_BASE(req_op_ctx, env);
if(AXIS2_CTX_GET_PROPERTY(ctx, env, MTOM_RECIVED_CONTENT_TYPE,
- AXIS2_FALSE))
+ AXIS2_FALSE))
{
- AXIS2_MSG_CTX_SET_PROPERTY(res_msg_ctx, env,
- MTOM_RECIVED_CONTENT_TYPE, AXIS2_CTX_GET_PROPERTY(ctx, env,
- MTOM_RECIVED_CONTENT_TYPE, AXIS2_FALSE), AXIS2_FALSE);
+ axis2_msg_ctx_set_property(res_msg_ctx, env,
+ MTOM_RECIVED_CONTENT_TYPE, AXIS2_CTX_GET_PROPERTY(ctx, env,
+ MTOM_RECIVED_CONTENT_TYPE, AXIS2_FALSE), AXIS2_FALSE);
}
if(AXIS2_CTX_GET_PROPERTY(ctx, env, AXIS2_HTTP_CHAR_SET_ENCODING,
- AXIS2_FALSE))
+ AXIS2_FALSE))
{
- AXIS2_MSG_CTX_SET_PROPERTY(res_msg_ctx, env,
- AXIS2_HTTP_CHAR_SET_ENCODING, AXIS2_CTX_GET_PROPERTY(ctx, env,
- AXIS2_HTTP_CHAR_SET_ENCODING, AXIS2_FALSE), AXIS2_FALSE);
+ axis2_msg_ctx_set_property(res_msg_ctx, env,
+ AXIS2_HTTP_CHAR_SET_ENCODING, AXIS2_CTX_GET_PROPERTY(ctx, env,
+ AXIS2_HTTP_CHAR_SET_ENCODING, AXIS2_FALSE), AXIS2_FALSE);
}
}
AXIS2_MSG_CTX_SET_DOING_REST(res_msg_ctx, env, AXIS2_MSG_CTX_GET_DOING_REST(
- msg_ctx, env));
+ msg_ctx, env));
soap_ns_uri = AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env) ?
- AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI:
- AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
+ AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI:
+ AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
res_envelope = axis2_http_transport_utils_create_soap_msg(env, msg_ctx,
- soap_ns_uri);
+ soap_ns_uri);
- property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, AXIS2_FALSE);
if(property)
- new_property = AXIS2_PROPERTY_CLONE(property, env);
+ new_property = axis2_property_clone(property, env);
if(new_property)
- AXIS2_MSG_CTX_SET_PROPERTY(res_msg_ctx, env,
+ axis2_msg_ctx_set_property(res_msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, new_property, AXIS2_FALSE);
if(res_envelope)
{
@@ -634,9 +630,9 @@
AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(res_msg_ctx, env, res_envelope);
engine = axis2_engine_create(env, AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx,
- env));
- if(AXIS2_TRUE == sandesha2_sender_worker_is_fault_envelope(sender_worker, env,
- res_envelope))
+ env));
+ if(AXIS2_TRUE == sandesha2_sender_worker_is_fault_envelope(env,
+ res_envelope))
AXIS2_ENGINE_RECEIVE_FAULT(engine, env, res_msg_ctx);
else
AXIS2_ENGINE_RECEIVE(engine, env, res_msg_ctx);
@@ -646,7 +642,6 @@
static axis2_bool_t AXIS2_CALL
sandesha2_sender_worker_is_fault_envelope(
- sandesha2_sender_worker_t *sender_worker,
const axis2_env_t *env,
axiom_soap_envelope_t *soap_envelope)
{
@@ -655,7 +650,7 @@
AXIS2_PARAM_CHECK(env->error, soap_envelope, AXIS2_FAILURE);
fault = AXIOM_SOAP_BODY_GET_FAULT(AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope,
- env), env);
+ env), env);
if(fault)
return AXIS2_TRUE;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org