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 da...@apache.org on 2007/05/06 13:02:57 UTC
svn commit: r535598 - in /webservices/sandesha/trunk/c/src/storage/sqlite:
permanent_next_msg_mgr.c permanent_storage_mgr.c
Author: damitha
Date: Sun May 6 04:02:56 2007
New Revision: 535598
URL: http://svn.apache.org/viewvc?view=rev&rev=535598
Log:
Tested single channel two way RM with spec 1.1. Fixed to sync with recent changes
in sandesha2c.
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c?view=diff&rev=535598&r1=535597&r2=535598
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c Sun May 6 04:02:56 2007
@@ -452,6 +452,8 @@
long temp_next_msg_no = 0;
axis2_char_t *seq_id = NULL;
axis2_char_t *temp_seq_id = NULL;
+ axis2_char_t *internal_seq_id = NULL;
+ axis2_char_t *temp_internal_seq_id = NULL;
sandesha2_permanent_next_msg_mgr_t *next_msg_mgr_impl = NULL;
AXIS2_LOG_INFO(env->log,
"[sandesha2]Entry:sandesha2_permanent_next_msg_mgr_match");
@@ -468,6 +470,14 @@
seq_id = sandesha2_next_msg_bean_get_seq_id(bean, env);
temp_seq_id = sandesha2_next_msg_bean_get_seq_id(candidate, env);
if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
+ {
+ equal = AXIS2_FALSE;
+ }
+ internal_seq_id = sandesha2_next_msg_bean_get_internal_seq_id(bean, env);
+ temp_internal_seq_id = sandesha2_next_msg_bean_get_internal_seq_id(
+ candidate, env);
+ if(internal_seq_id && temp_internal_seq_id && 0 != axutil_strcmp(
+ internal_seq_id, temp_internal_seq_id))
{
equal = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c?view=diff&rev=535598&r1=535597&r2=535598
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c Sun May 6 04:02:56 2007
@@ -789,7 +789,8 @@
sandesha2_storage_mgr_t *storage_mgr,
const axutil_env_t *env,
axis2_char_t *key,
- axis2_conf_ctx_t *conf_ctx)
+ axis2_conf_ctx_t *conf_ctx,
+ const axis2_bool_t persistent)
{
sandesha2_permanent_storage_mgr_t *storage_mgr_impl = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
@@ -818,8 +819,9 @@
sandesha2_msg_store_bean_t *msg_store_bean = NULL;
storage_mgr_impl = SANDESHA2_INTF_TO_IMPL(storage_mgr);
- msg_ctx = (axis2_msg_ctx_t *) axutil_hash_get(storage_mgr_impl->msg_ctx_map,
- key, AXIS2_HASH_KEY_STRING);
+ if(!persistent)
+ msg_ctx = (axis2_msg_ctx_t *) axutil_hash_get(
+ storage_mgr_impl->msg_ctx_map, key, AXIS2_HASH_KEY_STRING);
if(msg_ctx)
return msg_ctx;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "retrieved from database");
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org