Author: damitha
Date: Thu Jan 4 02:28:23 2007
New Revision: 492508
URL: http://svn.apache.org/viewvc?view=rev&rev=492508
Log:
Getting transactions working
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
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=492508&r1=492507&r2=492508
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Thu
Jan 4 02:28:23 2007
@@ -368,7 +368,7 @@
data_list = axis2_array_list_create(env, 1);
rc = retrieve_callback(env, stmt_retrieve,
sandesha2_permanent_bean_mgr_busy_handler, key,
data_list);
- if(rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS )
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_list)
@@ -377,7 +377,8 @@
sql_stmt_retrieve);
return AXIS2_FALSE;
}
- retrieve_bean = AXIS2_ARRAY_LIST_GET(data_list, env, 0);
+ if(0 < AXIS2_ARRAY_LIST_SIZE(data_list, env))
+ retrieve_bean = AXIS2_ARRAY_LIST_GET(data_list, env, 0);
if(data_list)
AXIS2_ARRAY_LIST_FREE(data_list, env);
sqlite3_reset(stmt_retrieve);
@@ -392,7 +393,7 @@
return AXIS2_FALSE;
}
rc = update_or_insert_callback(env, stmt_update,
sandesha2_permanent_bean_mgr_busy_handler, bean);
- if( rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS)
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
sandesha2_permanent_bean_mgr_handle_sql_error(env, dbconn,
@@ -414,7 +415,7 @@
return AXIS2_FALSE;
}
rc = update_or_insert_callback(env, stmt_insert,
sandesha2_permanent_bean_mgr_busy_handler, bean);
- if( rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS)
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
sandesha2_permanent_bean_mgr_handle_sql_error(env, dbconn,
@@ -463,7 +464,7 @@
data_list = axis2_array_list_create(env, 1);
rc = retrieve_callback(env, stmt_retrieve,
sandesha2_permanent_bean_mgr_busy_handler, key,
data_list);
- if(rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS)
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_list)
@@ -472,7 +473,8 @@
sql_stmt_retrieve);
return AXIS2_FALSE;
}
- bean = (sandesha2_rm_bean_t *) AXIS2_ARRAY_LIST_GET(data_list, env, 0);
+ if(0 < AXIS2_ARRAY_LIST_SIZE(data_list, env))
+ bean = (sandesha2_rm_bean_t *) AXIS2_ARRAY_LIST_GET(data_list, env, 0);
sqlite3_reset(stmt_retrieve);
if(data_list)
AXIS2_ARRAY_LIST_FREE(data_list, env);
@@ -493,7 +495,7 @@
return AXIS2_FALSE;
}
rc = remove_callback(stmt_remove,
sandesha2_permanent_bean_mgr_busy_handler, key);
- if(rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS )
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
sandesha2_permanent_bean_mgr_handle_sql_error(env, dbconn,
@@ -541,7 +543,7 @@
data_list = axis2_array_list_create(env, 1);
rc = retrieve_callback(env, stmt_retrieve,
sandesha2_permanent_bean_mgr_busy_handler, key,
data_list);
- if(rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS )
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_list)
@@ -550,7 +552,8 @@
sql_stmt_retrieve);
return AXIS2_FALSE;
}
- bean = (sandesha2_rm_bean_t *) AXIS2_ARRAY_LIST_GET(data_list, env, 0);
+ if(0 < AXIS2_ARRAY_LIST_SIZE(data_list, env))
+ bean = (sandesha2_rm_bean_t *) AXIS2_ARRAY_LIST_GET(data_list, env, 0);
sqlite3_reset(stmt_retrieve);
if(data_list)
AXIS2_ARRAY_LIST_FREE(data_list, env);
@@ -601,7 +604,7 @@
data_list = axis2_array_list_create(env, 1);
rc = retrieve_callback(env, stmt_retrieve_old_bean,
sandesha2_permanent_bean_mgr_busy_handler, key,
data_list);
- if(rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS )
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_list)
@@ -620,7 +623,7 @@
return AXIS2_FALSE;
}
rc = update_or_insert_callback(env, stmt_update,
sandesha2_permanent_bean_mgr_busy_handler, bean);
- if( rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS)
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_list)
@@ -630,7 +633,9 @@
return AXIS2_FALSE;
}
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
- old_bean = (sandesha2_rm_bean_t *) AXIS2_ARRAY_LIST_GET(data_list, env, 0);
+ if(0 < AXIS2_ARRAY_LIST_SIZE(data_list, env))
+ old_bean = (sandesha2_rm_bean_t *) AXIS2_ARRAY_LIST_GET(data_list,
+ env, 0);
if(old_bean)
key_l = sandesha2_rm_bean_get_key(old_bean, env);
if(data_list)
@@ -686,7 +691,7 @@
data_list = axis2_array_list_create(env, 0);
rc = retrieve_callback(env, stmt_find,
sandesha2_permanent_bean_mgr_busy_handler, NULL,
data_list);
- if(rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS )
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_list)
@@ -827,7 +832,7 @@
data_list = axis2_array_list_create(env, 0);
rc = sandesha2_msg_retrieve_callback(env, stmt_retrieve,
sandesha2_permanent_bean_mgr_busy_handler, key,
data_list);
- if(rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS )
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_list)
@@ -837,8 +842,9 @@
return NULL;
}
sqlite3_reset(stmt_retrieve);
- msg_store_bean = (sandesha2_msg_store_bean_t *) AXIS2_ARRAY_LIST_GET(
- data_list, env, 0);
+ if(0 < AXIS2_ARRAY_LIST_SIZE(data_list, env))
+ msg_store_bean = (sandesha2_msg_store_bean_t *) AXIS2_ARRAY_LIST_GET(
+ data_list, env, 0);
if(data_list)
AXIS2_ARRAY_LIST_FREE(data_list, env);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
@@ -888,7 +894,7 @@
data_list = axis2_array_list_create(env, 0);
rc = sandesha2_msg_retrieve_callback(env, stmt_retrieve,
sandesha2_permanent_bean_mgr_busy_handler, key,
data_list);
- if(rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS)
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_list)
@@ -898,8 +904,9 @@
return AXIS2_FALSE;
}
sqlite3_reset(stmt_retrieve);
- msg_store_bean = (sandesha2_msg_store_bean_t *) AXIS2_ARRAY_LIST_GET(
- data_list, env, 0);
+ if(0 < AXIS2_ARRAY_LIST_SIZE(data_list, env))
+ msg_store_bean = (sandesha2_msg_store_bean_t *) AXIS2_ARRAY_LIST_GET(
+ data_list, env, 0);
if(data_list)
AXIS2_ARRAY_LIST_FREE(data_list, env);
if(msg_store_bean)
@@ -920,7 +927,7 @@
}
rc = sandesha2_msg_update_or_insert_callback(env, stmt_update,
sandesha2_permanent_bean_mgr_busy_handler, bean);
- if( rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS)
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
sandesha2_permanent_bean_mgr_handle_sql_error(env, dbconn,
@@ -946,7 +953,7 @@
}
rc = sandesha2_msg_update_or_insert_callback(env, stmt_insert,
sandesha2_permanent_bean_mgr_busy_handler, bean);
- if( rc != SQLITE_OK )
+ if(rc != AXIS2_SUCCESS)
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
sandesha2_permanent_bean_mgr_handle_sql_error(env, dbconn,
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c?view=diff&rev=492508&r1=492507&r2=492508
==============================================================================
---
webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
(original)
+++
webservices/sandesha/trunk/c/src/storage/permanent/permanent_create_seq_mgr.c
Thu Jan 4 02:28:23 2007
@@ -51,8 +51,6 @@
axis2_array_list_t *data_list)
{
int rc = -1;
- sandesha2_create_seq_bean_t *bean = (sandesha2_create_seq_bean_t *)
- sandesha2_create_seq_bean_create(env);
axis2_char_t *create_seq_msg_id = (axis2_char_t *) key;
if(create_seq_msg_id)
{
@@ -72,6 +70,8 @@
}
while(rc == SQLITE_ROW)
{
+ sandesha2_create_seq_bean_t *bean = (sandesha2_create_seq_bean_t *)
+ sandesha2_create_seq_bean_create(env);
sandesha2_create_seq_bean_set_create_seq_msg_id(bean, env,
(axis2_char_t *) sqlite3_column_text(stmt, 0));
sandesha2_create_seq_bean_set_internal_seq_id(bean, env,
@@ -90,8 +90,8 @@
return AXIS2_FAILURE;
}
}
+ axis2_array_list_add(data_list, env, bean);
}
- axis2_array_list_add(data_list, env, bean);
return AXIS2_SUCCESS;
}
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c?view=diff&rev=492508&r1=492507&r2=492508
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_invoker_mgr.c
Thu Jan 4 02:28:23 2007
@@ -48,8 +48,6 @@
axis2_array_list_t *data_list)
{
int rc = -1;
- sandesha2_invoker_bean_t *bean = (sandesha2_invoker_bean_t *)
- sandesha2_invoker_bean_create(env);
axis2_char_t *msg_ctx_ref_key = (axis2_char_t *) key;
if(msg_ctx_ref_key)
{
@@ -69,6 +67,8 @@
}
while(rc == SQLITE_ROW)
{
+ sandesha2_invoker_bean_t *bean = (sandesha2_invoker_bean_t *)
+ sandesha2_invoker_bean_create(env);
sandesha2_invoker_bean_set_msg_ctx_ref_key(bean, env,
(axis2_char_t *) sqlite3_column_text(stmt, 0));
sandesha2_invoker_bean_set_msg_no(bean, env,
@@ -85,8 +85,8 @@
return AXIS2_FAILURE;
}
}
+ axis2_array_list_add(data_list, env, bean);
}
- axis2_array_list_add(data_list, env, bean);
return AXIS2_SUCCESS;
}
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=492508&r1=492507&r2=492508
==============================================================================
--- 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
Thu Jan 4 02:28:23 2007
@@ -50,8 +50,6 @@
axis2_array_list_t *data_list)
{
int rc = -1;
- sandesha2_next_msg_bean_t *bean = (sandesha2_next_msg_bean_t *)
- sandesha2_next_msg_bean_create(env);
axis2_char_t *seq_id = (axis2_char_t *) key;
if(seq_id)
{
@@ -71,6 +69,8 @@
}
while(rc == SQLITE_ROW)
{
+ sandesha2_next_msg_bean_t *bean = (sandesha2_next_msg_bean_t *)
+ sandesha2_next_msg_bean_create(env);
sandesha2_next_msg_bean_set_seq_id(bean, env,
(axis2_char_t *) sqlite3_column_text(stmt, 0));
sandesha2_next_msg_bean_set_ref_msg_key(bean, env,
@@ -87,8 +87,8 @@
return AXIS2_FAILURE;
}
}
+ axis2_array_list_add(data_list, env, bean);
}
- axis2_array_list_add(data_list, env, bean);
return AXIS2_SUCCESS;
}
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c?view=diff&rev=492508&r1=492507&r2=492508
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
Thu Jan 4 02:28:23 2007
@@ -51,8 +51,6 @@
axis2_array_list_t *data_list)
{
int rc = -1;
- sandesha2_sender_bean_t *bean = (sandesha2_sender_bean_t *)
- sandesha2_sender_bean_create(env);
axis2_char_t *msg_id = (axis2_char_t *) key;
if(msg_id)
{
@@ -71,6 +69,8 @@
}
while(rc == SQLITE_ROW)
{
+ sandesha2_sender_bean_t *bean = (sandesha2_sender_bean_t *)
+ sandesha2_sender_bean_create(env);
sandesha2_sender_bean_set_msg_id(bean, env,
(axis2_char_t *) sqlite3_column_text(stmt, 0));
sandesha2_sender_bean_set_msg_ctx_ref_key(bean, env,
@@ -103,8 +103,8 @@
return AXIS2_FAILURE;
}
}
+ axis2_array_list_add(data_list, env, bean);
}
- axis2_array_list_add(data_list, env, bean);
return AXIS2_SUCCESS;
}
Modified:
webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c?view=diff&rev=492508&r1=492507&r2=492508
==============================================================================
---
webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
(original)
+++
webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
Thu Jan 4 02:28:23 2007
@@ -57,8 +57,6 @@
axis2_array_list_t *data_list)
{
int rc = -1;
- sandesha2_seq_property_bean_t *bean = (sandesha2_seq_property_bean_t *)
- sandesha2_seq_property_bean_create(env);
axis2_char_t *id = (axis2_char_t *) key;
if(id)
{
@@ -78,6 +76,8 @@
}
while(rc == SQLITE_ROW)
{
+ sandesha2_seq_property_bean_t *bean = (sandesha2_seq_property_bean_t
*)
+ sandesha2_seq_property_bean_create(env);
sandesha2_seq_property_bean_set_seq_id(bean, env,
(axis2_char_t *) sqlite3_column_text(stmt, 0));
sandesha2_seq_property_bean_set_name(bean, env,
@@ -92,8 +92,8 @@
return AXIS2_FAILURE;
}
}
+ axis2_array_list_add(data_list, env, bean);
}
- axis2_array_list_add(data_list, env, bean);
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
