Author: damitha
Date: Mon Jan 22 04:07:46 2007
New Revision: 498594
URL: http://svn.apache.org/viewvc?view=rev&rev=498594
Log:
Now single channel echo sample is working with simple axis2 server,
apache2 in linux
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/workers/sender.c
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=498594&r1=498593&r2=498594
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
(original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Mon
Jan 22 04:07:46 2007
@@ -156,9 +156,9 @@
return AXIS2_SUCCESS; /* Reinjected Messages are not processed by
sandesha2 inflow handlers */
}
- axis2_allocator_switch_to_global_pool(env->allocator);
+ /*axis2_allocator_switch_to_global_pool(env->allocator);*/
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx, conf);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ /*axis2_allocator_switch_to_local_pool(env->allocator);*/
if(!storage_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot get the "
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=498594&r1=498593&r2=498594
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
(original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Mon Jan
22 04:07:46 2007
@@ -241,10 +241,10 @@
}
}
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ /*axis2_allocator_switch_to_global_pool(env->allocator);*/
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- axis2_allocator_switch_to_local_pool(env->allocator);
+ /*axis2_allocator_switch_to_local_pool(env->allocator);*/
fault_ctx = sandesha2_fault_mgr_check_for_last_msg_num_exceeded(
env, rm_msg_ctx, storage_mgr);
if(fault_ctx)
@@ -529,10 +529,10 @@
AXIS2_WSDL_MESSAGE_LABEL_IN);
/* TODO setting up fault callback */
- axis2_allocator_switch_to_global_pool(env->allocator);
+ /*axis2_allocator_switch_to_global_pool(env->allocator);*/
storage_mgr = sandesha2_utils_get_storage_mgr(env, conf_ctx,
AXIS2_CONF_CTX_GET_CONF(conf_ctx, env));
- axis2_allocator_switch_to_local_pool(env->allocator);
+ /*axis2_allocator_switch_to_local_pool(env->allocator);*/
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
if(!seq_prop_mgr)
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=498594&r1=498593&r2=498594
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Mon Jan 22 04:07:46
2007
@@ -148,28 +148,32 @@
{
axis2_param_t *parameter = NULL;
axis2_char_t *value = NULL;
+ sandesha2_storage_mgr_t *storage_mgr = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
AXIS2_PARAM_CHECK(env->error, conf, NULL);
+ axis2_allocator_switch_to_global_pool(env->allocator);
parameter = AXIS2_CONF_GET_PARAM(conf, env,
- SANDESHA2_STORAGE_MGR_PARAMETER);
+ SANDESHA2_STORAGE_MGR_PARAMETER);
if(!parameter)
parameter = axis2_param_create(env, SANDESHA2_STORAGE_MGR_PARAMETER,
- SANDESHA2_DEFAULT_STORAGE_MGR);
+ SANDESHA2_DEFAULT_STORAGE_MGR);
value = AXIS2_PARAM_GET_VALUE(parameter, env);
if(0 == AXIS2_STRCMP(value, SANDESHA2_INMEMORY_STORAGE_MGR))
- return sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_inmemory_storage_mgr(env, conf_ctx);
else if (0 == AXIS2_STRCMP(value, SANDESHA2_PERMANENT_STORAGE_MGR))
- return sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
+ storage_mgr = sandesha2_utils_get_permanent_storage_mgr(env, conf_ctx);
else
{
+ axis2_allocator_switch_to_local_pool(env->allocator);
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_UNKNOWN_STORAGE_MGR,
AXIS2_FAILURE);
return NULL;
}
- return NULL;
+ axis2_allocator_switch_to_local_pool(env->allocator);
+ return storage_mgr;
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
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=498594&r1=498593&r2=498594
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Mon Jan 22 04:07:46 2007
@@ -264,10 +264,10 @@
axis2_char_t *msg_id = NULL;
printf("in sender\n");
AXIS2_SLEEP(SANDESHA2_SENDER_SLEEP_TIME);
- axis2_allocator_switch_to_global_pool(env->allocator);
+ /*axis2_allocator_switch_to_global_pool(env->allocator);*/
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr,
env);
- axis2_allocator_switch_to_local_pool(env->allocator);
+ /*axis2_allocator_switch_to_local_pool(env->allocator);*/
mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
