Author: damitha
Date: Wed Jan 30 20:55:30 2008
New Revision: 616999
URL: http://svn.apache.org/viewvc?rev=616999&view=rev
Log:
Makeing work on Windows
Modified:
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/workers/sender.c
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c?rev=616999&r1=616998&r2=616999&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
(original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c Wed
Jan 30 20:55:30 2008
@@ -35,9 +35,7 @@
*/
struct sandesha2_permanent_bean_mgr
{
- sqlite3 *dbconn;
axis2_char_t *dbname;
-
};
static int
@@ -173,7 +171,6 @@
sandesha2_permanent_bean_mgr_t *bean_mgr = NULL;
bean_mgr = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_permanent_bean_mgr_t));
- bean_mgr->dbconn = NULL;
if(dbname)
bean_mgr->dbname = axutil_strdup(env, dbname);
return bean_mgr;
@@ -186,12 +183,6 @@
{
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_free_impl");
-
- if(bean_mgr->dbconn)
- {
- sqlite3_close(bean_mgr->dbconn);
- bean_mgr->dbconn = NULL;
- }
if(bean_mgr->dbname)
{
AXIS2_FREE(env->allocator, bean_mgr->dbname);
@@ -214,19 +205,17 @@
{
axis2_char_t *error_msg = NULL;
int rc = -1;
+ sqlite3 *dbconn = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert");
-
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return AXIS2_FALSE;
}
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_insert, 0, 0, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_insert, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
- rc = sandesha2_permanent_bean_mgr_busy_handler(env, bean_mgr->dbconn,
+ rc = sandesha2_permanent_bean_mgr_busy_handler(env, dbconn,
sql_stmt_insert, 0, 0, &error_msg, rc);
if( rc != SQLITE_OK )
{
@@ -234,8 +223,10 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql stmt: %s. sql error: %s",
sql_stmt_insert, error_msg);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_insert");
return AXIS2_TRUE;
@@ -249,25 +240,26 @@
{
axis2_char_t *error_msg = NULL;
int rc = -1;
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ sqlite3 *dbconn = NULL;
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return AXIS2_FALSE;
}
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_remove, 0, 0, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_remove, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_remove, 0, 0, &error_msg, rc);
+ dbconn, sql_stmt_remove, 0, 0, &error_msg, rc);
if(rc != SQLITE_OK )
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql stmt: %s. sql error: %s",
sql_stmt_remove, error_msg);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
+ sqlite3_close(dbconn);
return AXIS2_TRUE;
}
@@ -282,26 +274,23 @@
axis2_char_t *error_msg = NULL;
void *bean = NULL;
int rc = -1;
+ sqlite3 *dbconn = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_retrieve");
- if(!bean_mgr->dbconn)
- {
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- }
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return NULL;
}
args = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_bean_mgr_args_t));
args->env = (axutil_env_t*)env;
args->data = NULL;
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_retrieve, retrieve_func,
args,
+ rc = sqlite3_exec(dbconn, sql_stmt_retrieve, retrieve_func, args,
&error_msg);
if(rc == SQLITE_BUSY)
{
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_retrieve, retrieve_func, args,
+ dbconn, sql_stmt_retrieve, retrieve_func, args,
&error_msg, rc);
}
if(rc != SQLITE_OK )
@@ -310,12 +299,14 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql stmt: %s. sql error: %s",
sql_stmt_retrieve, error_msg);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
if(args->data)
bean = (void *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_retrieve");
return bean;
@@ -329,28 +320,28 @@
{
axis2_char_t *error_msg = NULL;
int rc = -1;
+ sqlite3 *dbconn = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_update");
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return AXIS2_FALSE;
}
-
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_update, 0, 0, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_update, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_update, 0, 0, &error_msg, rc);
+ dbconn, sql_stmt_update, 0, 0, &error_msg, rc);
if(rc != SQLITE_OK )
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s",
error_msg);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_update");
return AXIS2_TRUE;
@@ -365,23 +356,22 @@
{
sandesha2_bean_mgr_args_t *args = NULL;
int rc = -1;
+ sqlite3 *dbconn = NULL;
axutil_array_list_t *data_array = NULL;
axis2_char_t *error_msg = NULL;
args = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_bean_mgr_args_t));
args->env = (axutil_env_t*)env;
args->data = NULL;
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return NULL;
}
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_find, find_func, args,
+ rc = sqlite3_exec(dbconn, sql_stmt_find, find_func, args,
&error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_find, find_func, args, &error_msg, rc);
+ dbconn, sql_stmt_find, find_func, args, &error_msg, rc);
if(args->data)
data_array = (axutil_array_list_t *) args->data;
if(rc != SQLITE_OK )
@@ -393,11 +383,13 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s",
error_msg);
+ sqlite3_close(dbconn);
sqlite3_free(error_msg);
return NULL;
}
if(args)
AXIS2_FREE(env->allocator, args);
+ sqlite3_close(dbconn);
return data_array;
}
@@ -411,13 +403,12 @@
axis2_char_t *error_msg = NULL;
sandesha2_msg_store_bean_t *msg_store_bean = NULL;
int rc = -1;
+ sqlite3 *dbconn = NULL;
axis2_char_t sql_stmt_retrieve[512];
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_retrieve_msg_store_bean");
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return NULL;
}
@@ -429,11 +420,11 @@
"transport_to, execution_chain_str, flow, msg_recv_str, svr_side, "\
"in_msg_store_key, prop_str, action from msg where stored_key='%s'",
key);
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_retrieve,
+ rc = sqlite3_exec(dbconn, sql_stmt_retrieve,
sandesha2_msg_store_bean_retrieve_callback, args, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_retrieve,
+ dbconn, sql_stmt_retrieve,
sandesha2_msg_store_bean_retrieve_callback, args, &error_msg, rc);
if(rc != SQLITE_OK )
{
@@ -441,12 +432,14 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s",
error_msg);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
if(args->data)
msg_store_bean = (sandesha2_msg_store_bean_t *) args->data;
if(args)
AXIS2_FREE(env->allocator, args);
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_retrieve_msg_store_bean");
return msg_store_bean;
@@ -481,6 +474,7 @@
axis2_char_t *in_msg_store_key = NULL;
axis2_char_t *prop_str = NULL;
axis2_char_t *action = NULL;
+ sqlite3 *dbconn = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_update_msg_store_bean");
@@ -512,10 +506,8 @@
axutil_strlen(msg_recv_str) + sizeof(int) +
axutil_strlen(in_msg_store_key) +
axutil_strlen(prop_str) + axutil_strlen(action) + 512;
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return AXIS2_FALSE;
}
@@ -530,19 +522,21 @@
soap_env_str, soap_version, transport_out, op, svc, svc_grp, op_mep,
to_url, transport_to, reply_to, execution_chain_str, flow,
msg_recv_str, svr_side, in_msg_store_key, prop_str, action,
stored_key);
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_update, 0, 0, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_update, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_update, 0, 0, &error_msg, rc);
+ dbconn, sql_stmt_update, 0, 0, &error_msg, rc);
if( rc != SQLITE_OK )
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s", error_msg);
AXIS2_FREE(env->allocator, sql_stmt_update);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
AXIS2_FREE(env->allocator, sql_stmt_update);
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_update_msg_store_bean");
return AXIS2_TRUE;
@@ -577,6 +571,7 @@
axis2_char_t *in_msg_store_key = NULL;
axis2_char_t *prop_str = NULL;
axis2_char_t *action = NULL;
+ sqlite3 *dbconn = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
@@ -608,14 +603,11 @@
axutil_strlen(msg_recv_str) + sizeof(int) +
axutil_strlen(in_msg_store_key) +
axutil_strlen(prop_str) + axutil_strlen(action) + 512;
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return AXIS2_FALSE;
}
-
sql_stmt_insert = AXIS2_MALLOC(env->allocator, sql_size);
sprintf(sql_stmt_insert, "insert into msg(stored_key, msg_id, "\
"soap_env_str, soap_version, transport_out, op, svc, svc_grp, op_mep,"\
@@ -626,19 +618,21 @@
soap_env_str, soap_version, transport_out, op, svc, svc_grp, op_mep,
to_url, reply_to, transport_to, execution_chain_str, flow,
msg_recv_str,
svr_side, in_msg_store_key, prop_str, action);
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_insert, 0, 0, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_insert, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_insert, 0, 0, &error_msg, rc);
+ dbconn, sql_stmt_insert, 0, 0, &error_msg, rc);
if( rc != SQLITE_OK )
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s", error_msg);
AXIS2_FREE(env->allocator, sql_stmt_insert);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
AXIS2_FREE(env->allocator, sql_stmt_insert);
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
return AXIS2_TRUE;
@@ -653,28 +647,29 @@
axis2_char_t sql_stmt_remove[256];
axis2_char_t *error_msg = NULL;
int rc = -1;
+ sqlite3 *dbconn = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return AXIS2_FALSE;
}
sprintf(sql_stmt_remove, "delete from msg where stored_key='%s'", key);
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_remove, 0, 0, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_remove, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_remove, 0, 0, &error_msg, rc);
+ dbconn, sql_stmt_remove, 0, 0, &error_msg, rc);
if(rc != SQLITE_OK )
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s",
error_msg);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_remove_msg_store_bean");
return AXIS2_TRUE;
@@ -693,16 +688,14 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
int sql_size = -1;
+ sqlite3 *dbconn = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_store_response");
sql_size = axutil_strlen(seq_id) + axutil_strlen(response) +
sizeof(int) + sizeof(int) + 512;
-
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return AXIS2_FALSE;
}
@@ -710,19 +703,21 @@
sprintf(sql_stmt_insert, "insert into response(seq_id, response_str,"\
"msg_no, soap_version) values('%s', '%s', %d, %d)", seq_id,
response, msg_no, soap_version);
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_insert, 0, 0, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_insert, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_insert, 0, 0, &error_msg, rc);
+ dbconn, sql_stmt_insert, 0, 0, &error_msg, rc);
if( rc != SQLITE_OK )
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s", error_msg);
AXIS2_FREE(env->allocator, sql_stmt_insert);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
AXIS2_FREE(env->allocator, sql_stmt_insert);
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_store_response");
return AXIS2_TRUE;
@@ -738,29 +733,30 @@
axis2_char_t sql_stmt_remove[256];
axis2_char_t *error_msg = NULL;
int rc = -1;
+ sqlite3 *dbconn = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_remove_response");
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return AXIS2_FALSE;
}
sprintf(sql_stmt_remove,
"delete from response where seq_id='%s' and msg_no=%d", seq_id,
msg_no);
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_remove, 0, 0, &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_remove, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_remove, 0, 0, &error_msg, rc);
+ dbconn, sql_stmt_remove, 0, 0, &error_msg, rc);
if(rc != SQLITE_OK )
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s",
error_msg);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
+ sqlite3_close(dbconn);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_permanent_bean_mgr_remove_response");
return AXIS2_TRUE;
@@ -776,11 +772,10 @@
sandesha2_bean_mgr_args_t *args = NULL;
axis2_char_t *error_msg = NULL;
int rc = -1;
+ sqlite3 *dbconn = NULL;
axis2_char_t sql_stmt_retrieve[512];
- if(!bean_mgr->dbconn)
- bean_mgr->dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env,
- bean_mgr->dbname);
- if(!bean_mgr->dbconn)
+ dbconn = sandesha2_permanent_bean_mgr_get_dbconn(env, bean_mgr->dbname);
+ if(!dbconn)
{
return NULL;
}
@@ -789,11 +784,11 @@
args->data = NULL;
sprintf(sql_stmt_retrieve, "select response_str, soap_version from
response"\
" where seq_id='%s' and msg_no=%d", seq_id, msg_no);
- rc = sqlite3_exec(bean_mgr->dbconn, sql_stmt_retrieve,
+ rc = sqlite3_exec(dbconn, sql_stmt_retrieve,
sandesha2_permanent_bean_mgr_response_retrieve_callback, args,
&error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(env,
- bean_mgr->dbconn, sql_stmt_retrieve,
+ dbconn, sql_stmt_retrieve,
sandesha2_permanent_bean_mgr_response_retrieve_callback, args,
&error_msg, rc);
if(rc != SQLITE_OK )
@@ -802,8 +797,10 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s",
error_msg);
sqlite3_free(error_msg);
+ sqlite3_close(dbconn);
return AXIS2_FALSE;
}
+ sqlite3_close(dbconn);
return (sandesha2_response_t *) args->data;
}
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?rev=616999&r1=616998&r2=616999&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Wed Jan 30 20:55:30 2008
@@ -43,6 +43,7 @@
#include <axiom_soap_body.h>
#include <platforms/axutil_platform_auto_sense.h>
#include <axutil_types.h>
+/*#include <axutil_thread.h>*/
/**
* @brief Sender struct impl
@@ -122,9 +123,11 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_char_t *seq_id = NULL;
axis2_bool_t persistent_msg_ctx = AXIS2_FALSE;
+ /*axutil_thread_mutex_t *mutex = NULL;*/
args = (sandesha2_sender_args_t*)data;
env = args->env;
+ /*mutex = axutil_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);*/
axutil_allocator_switch_to_global_pool(env->allocator);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Entry:sandesha2_sender_worker_func");
@@ -177,7 +180,6 @@
}
if(sender_bean)
sandesha2_sender_bean_free(sender_bean, env);
-
}
#ifdef AXIS2_SVR_MULTI_THREADED
AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
