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/22 04:29:16 UTC
svn commit: r510371 - in /webservices/sandesha/trunk/c:
include/sandesha2_utils.h src/core/mod_sandesha2.c
src/msgprocessors/app_msg_processor.c src/util/sandesha2_utils.c
Author: damitha
Date: Wed Feb 21 19:29:16 2007
New Revision: 510371
URL: http://svn.apache.org/viewvc?view=rev&rev=510371
Log:
removed db_init code from mod_sandesha2
Modified:
webservices/sandesha/trunk/c/include/sandesha2_utils.h
webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_utils.h
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_utils.h?view=diff&rev=510371&r1=510370&r2=510371
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_utils.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_utils.h Wed Feb 21 19:29:16 2007
@@ -256,7 +256,7 @@
sandesha2_utils_is_single_channel(
const axis2_env_t *env,
const axis2_char_t *rm_version,
- const axis2_char_t *reply_to_addr);
+ const axis2_char_t *acks_to_addr);
/** @} */
#ifdef __cplusplus
Modified: webservices/sandesha/trunk/c/src/core/mod_sandesha2.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/mod_sandesha2.c?view=diff&rev=510371&r1=510370&r2=510371
==============================================================================
--- webservices/sandesha/trunk/c/src/core/mod_sandesha2.c (original)
+++ webservices/sandesha/trunk/c/src/core/mod_sandesha2.c Wed Feb 21 19:29:16 2007
@@ -90,12 +90,6 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
AXIS2_CONF_ADD_PARAM(conf, env, param);
- db_param = AXIS2_MODULE_DESC_GET_PARAM(module_desc, env, SANDESHA2_DB);
- if(db_param)
- {
- db_path = (axis2_char_t *) axis2_param_get_value(db_param, env);
- sandesha2_property_bean_set_db_path(property_bean, env, db_path);
- }
ctx = axis2_conf_ctx_get_base(conf_ctx, env);
axis2_ctx_set_property(ctx, env, SANDESHA2_INMEMORY_STORAGE_MGR, NULL,
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=510371&r1=510370&r2=510371
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Wed Feb 21 19:29:16 2007
@@ -487,9 +487,49 @@
reply_to_addr = axis2_endpoint_ref_get_address(reply_to_epr, env);
if(to_epr)
to_addr = axis2_endpoint_ref_get_address(to_epr, env);
- if(axis2_msg_ctx_get_to(msg_ctx, env) &&
- sandesha2_utils_is_single_channel(env, rm_version, reply_to_addr))
+
+
+
+
+
+
+
+
+ sandesha2_seq_property_bean_t *acks_to_bean = NULL;
+ sandesha2_seq_property_bean_t *to_bean = NULL;
+ axis2_char_t *acks_to_str = NULL;
+ axis2_endpoint_ref_t *acks_to = NULL;
+ axis2_bool_t back_channel_free = AXIS2_FALSE;
+ axis2_op_t *op = axis2_op_ctx_get_op(op_ctx, env);
+ int mep = -1;
+ acks_to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, str_seq_id,
+ SANDESHA2_SEQ_PROP_ACKS_TO_EPR);
+ if(acks_to_bean)
+ acks_to_str = sandesha2_seq_property_bean_get_value(acks_to_bean, env);
+ if(!acks_to_str)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] acks_to_str"
+ " seqeunce property is not set correctly");
+ return AXIS2_FAILURE;
+ }
+ acks_to = axis2_endpoint_ref_create(env, acks_to_str);
+ mep = AXIS2_OP_GET_AXIS_SPECIFIC_MEP_CONST(op, env);
+ back_channel_free = (reply_to_addr && !sandesha2_utils_is_anon_uri(env,
+ reply_to_addr)) || AXIS2_MEP_CONSTANT_IN_ONLY == mep;
+ printf("came10\n");
+ if(!reply_to_epr)
+ {
+ printf("came11\n");
+ to_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, str_seq_id,
+ SANDESHA2_SEQ_PROP_TO_EPR);
+ if(to_bean)
+ reply_to_addr = sandesha2_seq_property_bean_get_value(to_bean, env);
+ }
+ printf("reply_to_addr:%s\n", reply_to_addr);
+
+ if(sandesha2_utils_is_single_channel(env, rm_version, reply_to_addr))
+ {
+ printf("came13\n");
/* Do nothing */
}
else
@@ -503,6 +543,24 @@
sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
storage_mgr);
}
+
+
+
+
+
+
+ /*if(back_channel_free)
+ sandesha2_app_msg_processor_send_ack_if_reqd(env, rm_msg_ctx, msgs_str,
+ storage_mgr);
+ else if(sandesha2_utils_is_single_channel(env, rm_version, acks_to_str))
+ {
+ // Do nothing
+ }
+ else
+ {
+ 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))
{
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=510371&r1=510370&r2=510371
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Wed Feb 21 19:29:16 2007
@@ -1319,9 +1319,9 @@
sandesha2_utils_is_single_channel(
const axis2_env_t *env,
const axis2_char_t *rm_version,
- const axis2_char_t *reply_to_addr)
+ const axis2_char_t *acks_to_addr)
{
- if(sandesha2_utils_is_anon_uri(env, reply_to_addr) &&
+ if(sandesha2_utils_is_anon_uri(env, acks_to_addr) &&
(0 == AXIS2_STRCMP(SANDESHA2_SPEC_VERSION_1_0, rm_version)))
return AXIS2_TRUE;
else return AXIS2_FALSE;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org