Author: damitha
Date: Fri Jan 19 03:05:53 2007
New Revision: 497774
URL: http://svn.apache.org/viewvc?view=rev&rev=497774
Log:
working on windows issues
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
Modified:
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=497774&r1=497773&r2=497774
==============================================================================
---
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
(original)
+++
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
Fri Jan 19 03:05:53 2007
@@ -350,6 +350,7 @@
new_msg_store_key = axis2_uuid_gen(env);
sandesha2_storage_mgr_store_msg_ctx(storage_mgr, env,
new_msg_store_key, ref_msg_ctx);
+ printf("new_msg_store_key:%s\n", new_msg_store_key);
sandesha2_next_msg_bean_set_ref_msg_key(next_bean, env,
new_msg_store_key);
sandesha2_next_msg_bean_set_polling_mode(next_bean, env, polling_mode);
Modified: webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c?view=diff&rev=497774&r1=497773&r2=497774
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/next_msg_bean.c Fri Jan 19
03:05:53 2007
@@ -235,7 +235,7 @@
{
sandesha2_next_msg_bean_impl_t *next_msg_bean_impl = NULL;
next_msg_bean_impl = SANDESHA2_INTF_TO_IMPL(next_msg_bean);
- next_msg_bean_impl->ref_msg_key = ref_msg_key;
+ next_msg_bean_impl->ref_msg_key = AXIS2_STRDUP(ref_msg_key, env);
}
void AXIS2_CALL
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c?view=diff&rev=497774&r1=497773&r2=497774
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Fri
Jan 19 03:05:53 2007
@@ -63,7 +63,7 @@
return 0;
}
bean = (sandesha2_msg_store_bean_t *) args->data;
- if(!bean)
+ if(!bean && argc > 0)
{
bean = sandesha2_msg_store_bean_create(env);
args->data = bean;
@@ -104,7 +104,6 @@
if(0 == AXIS2_STRCMP(col_name[i], "transport_to"))
if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
{
- printf("argv[i]:%s\n", argv[i]);
sandesha2_msg_store_bean_set_transport_to(bean, env, argv[i]);
}
if(0 == AXIS2_STRCMP(col_name[i], "execution_chain_str"))
@@ -238,7 +237,8 @@
sqlite3_free(error_msg);
return AXIS2_FALSE;
}
- retrieve_bean = (sandesha2_rm_bean_t *) args->data;
+ if(args->data)
+ retrieve_bean = (sandesha2_rm_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
if(retrieve_bean)
@@ -323,7 +323,8 @@
sqlite3_free(error_msg);
return AXIS2_FALSE;
}
- bean = (sandesha2_rm_bean_t *) args->data;
+ if(args->data)
+ bean = (sandesha2_rm_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
@@ -392,7 +393,8 @@
sqlite3_free(error_msg);
return AXIS2_FALSE;
}
- bean = (sandesha2_rm_bean_t *) args->data;
+ if(args->data)
+ bean = (sandesha2_rm_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
@@ -418,7 +420,8 @@
sqlite3_free(error_msg);
return AXIS2_FALSE;
}
- bean = (sandesha2_rm_bean_t *) args->data;
+ if(args->data)
+ bean = (sandesha2_rm_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
@@ -487,7 +490,8 @@
return AXIS2_FALSE;
}
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
- old_bean = (sandesha2_rm_bean_t *) args->data;
+ if(args->data)
+ old_bean = (sandesha2_rm_bean_t *) args->data;
if(old_bean)
key = sandesha2_rm_bean_get_key(old_bean, env);
if(!key)
@@ -536,7 +540,8 @@
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(dbconn, sql_stmt_find,
find_func, args, &error_msg, rc);
- data_array = (axis2_array_list_t *) args->data;
+ if(args->data)
+ data_array = (axis2_array_list_t *) args->data;
if(rc != SQLITE_OK )
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
@@ -696,7 +701,8 @@
sqlite3_free(error_msg);
return AXIS2_FALSE;
}
- msg_store_bean = (sandesha2_msg_store_bean_t *) args->data;
+ if(args->data)
+ msg_store_bean = (sandesha2_msg_store_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
@@ -801,7 +807,8 @@
sqlite3_free(error_msg);
return AXIS2_FALSE;
}
- msg_store_bean = (sandesha2_msg_store_bean_t *) args->data;
+ if(args->data)
+ msg_store_bean = (sandesha2_msg_store_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
if(msg_store_bean)
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c?view=diff&rev=497774&r1=497773&r2=497774
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
Fri Jan 19 03:05:53 2007
@@ -48,8 +48,8 @@
char **argv,
char **col_name)
{
- int i = 0;
sandesha2_next_msg_bean_t *bean = NULL;
+ int i = 0;
sandesha2_bean_mgr_args_t *args = (sandesha2_bean_mgr_args_t *) not_used;
const axis2_env_t *env = args->env;
axis2_array_list_t *data_list = (axis2_array_list_t *) args->data;
@@ -63,14 +63,23 @@
data_list = axis2_array_list_create(env, 0);
args->data = data_list;
}
- bean = sandesha2_next_msg_bean_create(env);
+ if(argc > 0)
+ {
+ bean = sandesha2_next_msg_bean_create(env);
+ }
for(i = 0; i < argc; i++)
{
if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
+ {
sandesha2_next_msg_bean_set_seq_id(bean, env, argv[i]);
+ }
if(0 == AXIS2_STRCMP(col_name[i], "ref_msg_key"))
- if(argv[i])
+ {
+ if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
+ {
sandesha2_next_msg_bean_set_ref_msg_key(bean, env, argv[i]);
+ }
+ }
if(0 == AXIS2_STRCMP(col_name[i], "polling_mode"))
sandesha2_next_msg_bean_set_polling_mode(bean, env,
AXIS2_ATOI(argv[i]));
@@ -78,7 +87,8 @@
sandesha2_next_msg_bean_set_next_msg_no_to_process(bean, env,
atol(argv[i]));
}
- axis2_array_list_add(data_list, env, bean);
+ if(bean)
+ axis2_array_list_add(data_list, env, bean);
return 0;
}
@@ -98,7 +108,7 @@
args->data = NULL;
return 0;
}
- if(!bean)
+ if(!bean && argc > 0)
{
bean = sandesha2_next_msg_bean_create(env);
args->data = bean;
@@ -108,8 +118,10 @@
if(0 == AXIS2_STRCMP(col_name[i], "seq_id"))
sandesha2_next_msg_bean_set_seq_id(bean, env, argv[i]);
if(0 == AXIS2_STRCMP(col_name[i], "ref_msg_key"))
- if(argv[i])
+ if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
+ {
sandesha2_next_msg_bean_set_ref_msg_key(bean, env, argv[i]);
+ }
if(0 == AXIS2_STRCMP(col_name[i], "polling_mode"))
{
sandesha2_next_msg_bean_set_polling_mode(bean, env,
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=497774&r1=497773&r2=497774
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Fri Jan 19 03:05:53
2007
@@ -240,10 +240,13 @@
axis2_char_t *seq_id = NULL;
key = sandesha2_next_msg_bean_get_ref_msg_key(bean, env);
if(key)
+ {
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, key);
+ }
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);
+ if(seq_id)
+ sandesha2_next_msg_mgr_remove(next_mgr, env, seq_id);
}
}
highest_in_msg_key = sandesha2_utils_get_seq_property(env, seq_id,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
