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=497010&r1=497009&r2=497010 ============================================================================== --- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original) +++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed Jan 17 04:51:35 2007 @@ -362,11 +362,8 @@ if(!invoker) { invoker = sandesha2_in_order_invoker_create(env); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, invoker); - AXIS2_PROPERTY_SET_FREE_FUNC(property, env, - sandesha2_in_order_invoker_free_void_arg); + property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, + AXIS2_FALSE, sandesha2_in_order_invoker_free_void_arg, invoker); AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env), env, SANDESHA2_INVOKER, property, AXIS2_FALSE); } @@ -394,11 +391,8 @@ if(!sender) { sender = sandesha2_sender_create(env); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, sender); - AXIS2_PROPERTY_SET_FREE_FUNC(property, env, - sandesha2_sender_free_void_arg); + property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, + AXIS2_FALSE, sandesha2_sender_free_void_arg, sender); AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env), env, SANDESHA2_SENDER, property, AXIS2_FALSE); } @@ -428,7 +422,7 @@ if(!polling_mgr) { polling_mgr = sandesha2_polling_mgr_create(env); - property = axis2_property_create_with_args(env, 3, + property = axis2_property_create_with_args(env, 3, AXIS2_FALSE, sandesha2_polling_mgr_free_void_arg, polling_mgr); AXIS2_CTX_SET_PROPERTY(AXIS2_CONF_CTX_GET_BASE(conf_ctx, env), env, SANDESHA2_POLLING_MGR, property, AXIS2_FALSE); @@ -490,11 +484,8 @@ /* TODO we need to class load the proper storage mgr */ sandesha2_storage_mgr_t *storage_mgr = sandesha2_inmemory_storage_mgr_create(env, conf_ctx); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, storage_mgr); - AXIS2_PROPERTY_SET_FREE_FUNC(property, env, - sandesha2_storage_mgr_free_void_arg); + property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, + AXIS2_FALSE, sandesha2_storage_mgr_free_void_arg, storage_mgr); AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR, property, AXIS2_FALSE); return storage_mgr; @@ -521,8 +512,8 @@ storage_mgr = AXIS2_PROPERTY_GET_VALUE(property, env); else storage_mgr = sandesha2_permanent_storage_mgr_create(env, conf_ctx); - property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0, - storage_mgr); + property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, + AXIS2_FALSE, 0, storage_mgr); AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR, property, AXIS2_FALSE); /*if(property) @@ -530,8 +521,8 @@ sandesha2_storage_mgr_t *storage_mgr = sandesha2_permanent_storage_mgr_create(env, conf_ctx); AXIS2_ARRAY_LIST_ADD(storage_mgr_list, env, storage_mgr); - property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, 0, - storage_mgr_list); + property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, + AXIS2_FALSE, 0, storage_mgr_list); AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR, property, AXIS2_FALSE);*/ return storage_mgr; @@ -734,10 +725,9 @@ if(property) { axis2_char_t *value = AXIS2_PROPERTY_GET_VALUE(property, env); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, value); - AXIS2_CTX_SET_PROPERTY(new_msg, env, AXIS2_TRANSPORT_URL, property, + property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST, + AXIS2_FALSE, 0, value); + AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_TRANSPORT_URL, property, AXIS2_FALSE); } property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_WSA_VERSION, @@ -747,8 +737,7 @@ axis2_msg_ctx_t *req_msg = NULL; axis2_op_ctx_t *op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(ref_msg, env); - req_msg = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env, - AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE); + req_msg = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env, AXIS2_WSDL_MESSAGE_LABEL_IN); if(req_msg) { property = AXIS2_MSG_CTX_GET_PROPERTY(req_msg, env, @@ -761,11 +750,9 @@ { addr_ver = AXIS2_PROPERTY_GET_VALUE(property, env); } - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(addr_ver, env)); - AXIS2_CTX_SET_PROPERTY(new_msg, env, AXIS2_WSA_VERSION, property, - AXIS2_FALSE); + property = axis2_property_create_with_args(env, 0, 0, 0, addr_ver); + AXIS2_MSG_CTX_SET_PROPERTY(new_msg, env, AXIS2_WSA_VERSION, property, + AXIS2_FALSE); property = AXIS2_MSG_CTX_GET_PROPERTY(ref_msg, env, AXIS2_TRANSPORT_OUT, AXIS2_FALSE); @@ -1237,24 +1224,19 @@ sandesha2_msg_ctx_set_msg_type(rm_msg_ctx, env, SANDESHA2_MSG_TYPE_CREATE_SEQ); /* Message will be stored in the sandesha2_transport_sender */ - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, storage_key); + property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST, + AXIS2_FALSE, 0, storage_key); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE); transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_FREE_FUNC(property, env, - transport_out->ops->free_void_arg); - AXIS2_PROPERTY_SET_VALUE(property, env, transport_out); + property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION, + AXIS2_FALSE, transport_out->ops->free_void_arg, transport_out); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE); + property = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST, + AXIS2_FALSE, 0, SANDESHA2_VALUE_TRUE); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE); sandesha2_transport_out = sandesha2_utils_get_transport_out(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=497010&r1=497009&r2=497010 ============================================================================== --- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Wed Jan 17 04:51:35 2007 @@ -353,7 +353,7 @@ axis2_msg_ctx_t *req_msg_ctx = NULL; op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(first_app_msg, env); req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env, - AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE); + AXIS2_WSDL_MESSAGE_LABEL_IN); if(req_msg_ctx) { property = AXIS2_MSG_CTX_GET_PROPERTY(req_msg_ctx, env, @@ -395,7 +395,7 @@ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(first_app_msg, env); req_msg_ctx = AXIS2_OP_CTX_GET_MSG_CTX(op_ctx, env, - AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE); + AXIS2_WSDL_MESSAGE_LABEL_IN); if(!req_msg_ctx) { AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot find" 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=497010&r1=497009&r2=497010 ============================================================================== --- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original) +++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Wed Jan 17 04:51:35 2007 @@ -61,10 +61,10 @@ axis2_char_t *seq_id, sandesha2_storage_mgr_t *storage_mgr); -static axis2_bool_t +/*static axis2_bool_t sandesha2_terminate_mgr_is_property_deletable( const axis2_env_t *env, - axis2_char_t *name); + axis2_char_t *name);*/ AXIS2_EXTERN axis2_status_t AXIS2_CALL sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg( @@ -75,8 +75,9 @@ { axis2_bool_t in_order_invoke = AXIS2_FALSE; sandesha2_property_bean_t *prop_bean = NULL; - axis2_char_t *clean_status = NULL; + AXIS2_LOG_INFO(env->log, + "[sandesha2]Entry:sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg"); AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE); @@ -92,21 +93,30 @@ in_order_invoke = sandesha2_property_bean_is_in_order(prop_bean, env); if(!in_order_invoke) { + axis2_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, + AXIS2_HASH_KEY_STRING, AXIS2_STRDUP( + SANDESHA2_CLEANED_ON_TERMINATE_MSG, env)); sandesha2_terminate_mgr_clean_recv_side_after_invocation(env, conf_ctx, seq_id, storage_mgr); } - clean_status = axis2_hash_get(sandesha2_terminate_mgr_rcv_side_clean_map, - seq_id, AXIS2_HASH_KEY_STRING); - if(clean_status && 0 == AXIS2_STRCMP(clean_status, - SANDESHA2_CLEANED_AFTER_INVOCATION)) + else { - sandesha2_terminate_mgr_complete_termination_of_recv_side(env, conf_ctx, seq_id, + axis2_char_t *clean_status = axis2_hash_get( + sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, + AXIS2_HASH_KEY_STRING); + if(clean_status && 0 == AXIS2_STRCMP(clean_status, + SANDESHA2_CLEANED_AFTER_INVOCATION)) + { + sandesha2_terminate_mgr_complete_termination_of_recv_side(env, conf_ctx, seq_id, storage_mgr); - } - else - axis2_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, + } + else + axis2_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, AXIS2_HASH_KEY_STRING, AXIS2_STRDUP( SANDESHA2_CLEANED_ON_TERMINATE_MSG, env)); + } + AXIS2_LOG_INFO(env->log, + "[sandesha2]Exit:sandesha2_terminate_mgr_clean_recv_side_after_terminate_msg"); return AXIS2_SUCCESS; } @@ -123,12 +133,14 @@ int i = 0; axis2_char_t *clean_status = NULL; + AXIS2_LOG_INFO(env->log, + "[sandesha2]Entry:sandesha2_terminate_mgr_clean_recv_side_after_invocation"); AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, storage_mgr, AXIS2_FAILURE); - if(NULL == sandesha2_terminate_mgr_rcv_side_clean_map) + if(!sandesha2_terminate_mgr_rcv_side_clean_map) { sandesha2_terminate_mgr_rcv_side_clean_map = axis2_hash_make(env); } @@ -156,16 +168,20 @@ clean_status = axis2_hash_get(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, AXIS2_HASH_KEY_STRING); - if(NULL != clean_status && 0 == AXIS2_STRCMP(clean_status, + if(clean_status && 0 == AXIS2_STRCMP(clean_status, SANDESHA2_CLEANED_ON_TERMINATE_MSG)) + { sandesha2_terminate_mgr_complete_termination_of_recv_side(env, conf_ctx, seq_id, storage_mgr); + } else axis2_hash_set(sandesha2_terminate_mgr_rcv_side_clean_map, seq_id, AXIS2_HASH_KEY_STRING, AXIS2_STRDUP( SANDESHA2_CLEANED_AFTER_INVOCATION, env)); + AXIS2_LOG_INFO(env->log, + "[sandesha2]Exit:sandesha2_terminate_mgr_clean_recv_side_after_invocation"); return AXIS2_SUCCESS; } @@ -182,7 +198,8 @@ axis2_char_t *highest_in_msg_key = NULL; int i = 0, size = 0; - + AXIS2_LOG_INFO(env->log, + "[sandesha2]Entry:sandesha2_terminate_mgr_complete_termination_of_recv_side"); AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE); @@ -190,8 +207,7 @@ next_mgr = sandesha2_storage_mgr_get_next_msg_mgr(storage_mgr, env); find_bean = sandesha2_next_msg_bean_create(env); - /* test comment */ - /*sandesha2_next_msg_bean_set_seq_id(find_bean, env, seq_id);*/ + sandesha2_next_msg_bean_set_seq_id(find_bean, env, seq_id); found_list = sandesha2_next_msg_mgr_find(next_mgr, env, find_bean); if(found_list) @@ -207,11 +223,9 @@ key = sandesha2_next_msg_bean_get_ref_msg_key(bean, env); if(key) sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, key); - /*test code */ seq_id = sandesha2_next_msg_bean_get_seq_id((sandesha2_rm_bean_t *) bean, env); sandesha2_next_msg_mgr_remove(next_mgr, env, seq_id); - /* end test code */ } } highest_in_msg_key = sandesha2_utils_get_seq_property(env, seq_id, @@ -223,6 +237,8 @@ } sandesha2_terminate_mgr_remove_recv_side_properties(env, conf_ctx, seq_id, storage_mgr); + AXIS2_LOG_INFO(env->log, + "[sandesha2]Exit:sandesha2_terminate_mgr_complete_termination_of_recv_side"); return AXIS2_SUCCESS; } @@ -236,6 +252,8 @@ sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL; sandesha2_seq_property_bean_t *all_seq_bean = NULL; + AXIS2_LOG_INFO(env->log, + "[sandesha2]Entry:sandesha2_terminate_mgr_remove_recv_side_properties"); AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE); @@ -269,6 +287,8 @@ sandesha2_seq_property_mgr_update(seq_prop_mgr, env, all_seq_bean); } } + AXIS2_LOG_INFO(env->log, + "[sandesha2]Exit:sandesha2_terminate_mgr_remove_recv_side_properties"); return AXIS2_SUCCESS; } @@ -282,6 +302,8 @@ { sandesha2_seq_property_mgr_t *seq_prop_mgr = NULL; sandesha2_seq_property_bean_t *seq_term_bean = NULL; + AXIS2_LOG_INFO(env->log, + "[sandesha2]Entry:sandesha2_terminate_mgr_terminate_sending_side"); AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE); @@ -294,6 +316,8 @@ sandesha2_terminate_mgr_clean_sending_side_data(env, conf_ctx, seq_id, svr_side, storage_mgr); + AXIS2_LOG_INFO(env->log, + "[sandesha2]Exit:sandesha2_terminate_mgr_terminate_sending_side"); return AXIS2_SUCCESS; } @@ -341,6 +365,7 @@ return AXIS2_SUCCESS; } +/* static axis2_bool_t sandesha2_terminate_mgr_is_property_deletable( const axis2_env_t *env, @@ -368,7 +393,7 @@ AXIS2_FREE(env->allocator, name_l); return deletable; } - +*/ AXIS2_EXTERN axis2_status_t AXIS2_CALL sandesha2_terminate_mgr_time_out_sending_side_seq( const axis2_env_t *env, @@ -407,10 +432,13 @@ sandesha2_sender_mgr_t *retrans_mgr = NULL; sandesha2_create_seq_mgr_t *create_seq_mgr = NULL; axis2_char_t *out_seq_id = NULL; + axis2_char_t *internal_seq_id = NULL; axis2_array_list_t *found_list = NULL; sandesha2_create_seq_bean_t *find_create_seq_bean = NULL; sandesha2_seq_property_bean_t *find_seq_prop_bean = NULL; + AXIS2_LOG_INFO(env->log, + "[sandesha2]Entry:sandesha2_terminate_mgr_clean_sending_side_data"); AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE); @@ -444,8 +472,10 @@ } } + internal_seq_id = sandesha2_utils_get_seq_property(env, seq_id, + SANDESHA2_SEQ_PROP_INTERNAL_SEQ_ID, storage_mgr); found_list = sandesha2_sender_mgr_find_by_internal_seq_id(retrans_mgr, env, - seq_id); + internal_seq_id); if(found_list) { int i = 0; @@ -453,8 +483,11 @@ { sandesha2_sender_bean_t *retrans_bean = NULL; axis2_char_t *msg_store_key = NULL; + axis2_char_t *msg_id = NULL; retrans_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i); + msg_id = sandesha2_sender_bean_get_msg_id(retrans_bean, env); + sandesha2_sender_mgr_remove(retrans_mgr, env, msg_id); msg_store_key = sandesha2_sender_bean_get_msg_ctx_ref_key( retrans_bean, env); sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, msg_store_key); @@ -462,9 +495,8 @@ } find_create_seq_bean = sandesha2_create_seq_bean_create(env); - /* test comment */ - /*sandesha2_create_seq_bean_set_internal_seq_id(find_create_seq_bean, env, - seq_id);*/ + sandesha2_create_seq_bean_set_internal_seq_id(find_create_seq_bean, env, + internal_seq_id); found_list = sandesha2_create_seq_mgr_find(create_seq_mgr, env, find_create_seq_bean); if(found_list) @@ -487,8 +519,7 @@ } find_seq_prop_bean = sandesha2_seq_property_bean_create(env); - /* test comment */ - /*sandesha2_seq_property_bean_set_seq_id(find_seq_prop_bean, env, seq_id);*/ + sandesha2_seq_property_bean_set_seq_id(find_seq_prop_bean, env, internal_seq_id); found_list = sandesha2_seq_property_mgr_find(seq_prop_mgr, env, find_seq_prop_bean); if(found_list) @@ -522,6 +553,8 @@ } } } + AXIS2_LOG_INFO(env->log, + "[sandesha2]Exit:sandesha2_terminate_mgr_clean_sending_side_data"); return AXIS2_SUCCESS; } @@ -574,10 +607,7 @@ terminate_rm_msg = sandesha2_msg_creator_create_terminate_seq_msg(env, rm_msg_ctx, out_seq_id, int_seq_id, storage_mgr); sandesha2_msg_ctx_set_flow(terminate_rm_msg, env, AXIS2_OUT_FLOW); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST); - AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE, - env)); + property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE); sandesha2_msg_ctx_set_property(terminate_rm_msg, env, SANDESHA2_APPLICATION_PROCESSING_DONE, property); @@ -612,9 +642,7 @@ { axis2_char_t *value = sandesha2_seq_property_bean_get_value( transport_to_bean, env); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, value); + property = axis2_property_create_with_args(env, 0, 0, 0, value); sandesha2_msg_ctx_set_property(terminate_rm_msg, env, AXIS2_TRANSPORT_URL, property); } @@ -635,9 +663,7 @@ sandesha2_msg_ctx_get_msg_id(terminate_rm_msg, env)); sandesha2_sender_bean_set_send(terminate_bean, env, AXIS2_TRUE); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE); + property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE); sandesha2_msg_ctx_set_property(terminate_rm_msg, env, SANDESHA2_QUALIFIED_FOR_SENDING, property); @@ -658,25 +684,18 @@ msg_ctx1 = sandesha2_msg_ctx_get_msg_ctx(terminate_rm_msg, env); transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx1, env); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, transport_out); - AXIS2_PROPERTY_SET_FREE_FUNC(property, env, - transport_out->ops->free_void_arg); + property = axis2_property_create_with_args(env, 0, 0, + transport_out->ops->free_void_arg, transport_out); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx1, env, SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, property, AXIS2_FALSE); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST); - AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(key, env)); + property = axis2_property_create_with_args(env, 0, 0, 0, key); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx1, env, SANDESHA2_MESSAGE_STORE_KEY, property, AXIS2_FALSE); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST); - AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE, - env)); + property = axis2_property_create_with_args(env, 0, 0, 0, + SANDESHA2_VALUE_TRUE); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx1, env, SANDESHA2_SET_SEND_TO_TRUE, property, AXIS2_FALSE); Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=497010&r1=497009&r2=497010 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original) +++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Wed Jan 17 04:51:35 2007 @@ -229,10 +229,7 @@ AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, NULL); AXIS2_MSG_CTX_SET_TO(msg_ctx, env, NULL); AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, NULL); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST); - AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(SANDESHA2_VALUE_TRUE, - env)); + property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_REINJECTED_MESSAGE, property, AXIS2_FALSE); return AXIS2_SUCCESS; @@ -268,7 +265,7 @@ int i = 0; AXIS2_SLEEP(SANDESHA2_INVOKER_SLEEP_TIME); - if(!invoker->conf_ctx || !invoker->conf_ctx->ops) + if(!invoker->conf_ctx) return NULL; storage_mgr = sandesha2_utils_get_storage_mgr(env, invoker->conf_ctx, @@ -357,7 +354,6 @@ printf("msg_ref_key:%s\n", key); msg_to_invoke = sandesha2_storage_mgr_retrieve_msg_ctx( storage_mgr, env, key, invoker->conf_ctx); - printf("msg_to_invoke:%ld\n", msg_to_invoke); if(msg_to_invoke) rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_to_invoke); @@ -366,9 +362,8 @@ * changed when WS-AT is available. */ sandesha2_transaction_commit(transaction, env); - property = axis2_property_create(env); - AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION); - AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE); + property = axis2_property_create_with_args(env, 0, 0, 0, + SANDESHA2_VALUE_TRUE); AXIS2_MSG_CTX_SET_PROPERTY(msg_to_invoke, env, SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE); @@ -392,7 +387,7 @@ AXIS2_MSG_CTX_SET_PAUSED(msg_to_invoke, env, AXIS2_FALSE); status = AXIS2_ENGINE_RESUME_RECEIVE(engine, env, msg_to_invoke); if(!status) - return status; + return NULL; } invoked = AXIS2_TRUE; transaction = sandesha2_storage_mgr_get_transaction( 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=497010&r1=497009&r2=497010 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original) +++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Wed Jan 17 04:51:35 2007 @@ -239,15 +239,19 @@ sender_worker_bean = sandesha2_sender_mgr_retrieve(sender_mgr, env, msg_id); if(!sender_worker_bean) { + printf("sender_worker_bean is NULL\n"); sandesha2_transaction_rollback(transaction, env); return NULL; } key = sandesha2_sender_bean_get_msg_ctx_ref_key(sender_worker_bean, env); + axis2_allocator_switch_to_global_pool(env->allocator); msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env, key, sender_worker->conf_ctx); + axis2_allocator_switch_to_local_pool(env->allocator); if(!msg_ctx) { + printf("msg_ctx is not present\n"); sandesha2_transaction_rollback(transaction, env); AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] msg_ctx is " "not present in the store"); @@ -259,7 +263,7 @@ AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE); else { - property = axis2_property_create_with_args(env, 3, 0, + property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE); @@ -268,6 +272,7 @@ sender_worker_bean, sender_worker->conf_ctx, storage_mgr); if(!continue_sending) { + printf("do not continue\n"); sandesha2_transaction_rollback(transaction, env); AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Do not continue sending the message"); @@ -281,6 +286,7 @@ if(qualified_for_sending && 0 != AXIS2_STRCMP( qualified_for_sending, SANDESHA2_VALUE_TRUE)) { + printf("not qualified for sending\n"); sandesha2_transaction_rollback(transaction, env); AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Message is not qualified for sending"); @@ -312,6 +318,7 @@ } if(continue_sending) { + printf("continue sending is true\n"); sandesha2_transaction_rollback(transaction, env); AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Continue "\ "Sending is true. So returning from Sender Worker"); @@ -356,7 +363,7 @@ AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE); else { - property = axis2_property_create_with_args(env, 3, 0, + property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE); @@ -378,7 +385,7 @@ AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_TRUE); else { - property = axis2_property_create_with_args(env, 3, 0, + property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_TRUE); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE); @@ -445,7 +452,6 @@ sandesha2_terminate_seq_res_t *terminate_seq_res = NULL; axis2_char_t *seq_id = NULL; axis2_conf_ctx_t *conf_ctx = NULL; - axis2_char_t *int_seq_id = NULL; terminate_seq_res = (sandesha2_terminate_seq_res_t*) sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env, @@ -464,7 +470,7 @@ AXIS2_PROPERTY_SET_VALUE(property, env, SANDESHA2_VALUE_FALSE); else { - property = axis2_property_create_with_args(env, 3, 0, + property = axis2_property_create_with_args(env, 0, 0, 0, SANDESHA2_VALUE_FALSE); AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
