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/04/25 08:51:00 UTC
svn commit: r532225 - in /webservices/sandesha/trunk/c: ./ include/
src/core/ src/storage/mysql/ src/storage/sqlite/ src/util/ src/workers/
Author: damitha
Date: Tue Apr 24 23:50:59 2007
New Revision: 532225
URL: http://svn.apache.org/viewvc?view=rev&rev=532225
Log:
More changes to make sqlite storage working
Added:
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_bean_mgr.h
- copied unchanged from r530743, webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_create_seq_mgr.h
- copied unchanged from r530743, webservices/sandesha/trunk/c/include/sandesha2_permanent_create_seq_mgr.h
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_invoker_mgr.h
- copied unchanged from r530743, webservices/sandesha/trunk/c/include/sandesha2_permanent_invoker_mgr.h
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_next_msg_mgr.h
- copied unchanged from r530743, webservices/sandesha/trunk/c/include/sandesha2_permanent_next_msg_mgr.h
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_sender_mgr.h
- copied unchanged from r530743, webservices/sandesha/trunk/c/include/sandesha2_permanent_sender_mgr.h
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_seq_property_mgr.h
- copied unchanged from r530743, webservices/sandesha/trunk/c/include/sandesha2_permanent_seq_property_mgr.h
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_transaction.h
- copied unchanged from r530743, webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h
Removed:
webservices/sandesha/trunk/c/include/sandesha2_permanent_bean_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_create_seq_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_invoker_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_next_msg_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_sender_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_seq_property_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h
webservices/sandesha/trunk/c/include/sandesha2_permanent_transaction.h
Modified:
webservices/sandesha/trunk/c/configure.ac
webservices/sandesha/trunk/c/src/core/Makefile.am
webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am
webservices/sandesha/trunk/c/src/storage/mysql/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
Modified: webservices/sandesha/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/configure.ac?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/configure.ac (original)
+++ webservices/sandesha/trunk/c/configure.ac Tue Apr 24 23:50:59 2007
@@ -61,11 +61,65 @@
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(whether to build mysql storage library)
+AC_ARG_ENABLE(mysql, [ --enable-mysql build mysql storage. default=no],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ WRAPPER_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ WRAPPER_DIR="mysql"
+ #PKG_CHECK_MODULES(PARSER, libmysqlclient)
+ if test -d $srcdir/storage/mysql; then
+ CFLAGS="$CFLAGS $STORAGE_CFLAGS"
+ LDFLAGS="$LDFLAGS $STORAGE_LIBS"
+ fi
+
+ MYSQL_LIBS="$srcdir/storage/mysql"
+ WRAPPER_DIR="mysql"
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
+SQLITE_LIBS=""
+
+AC_MSG_CHECKING(whether to build sqlite storage library)
+AC_ARG_ENABLE(sqlite, [ --enable-sqlite build sqlite storage library. default=yes],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ WRAPPER_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ WRAPPER_DIR="sqlite"
+ #PKG_CHECK_MODULES(PARSER, libsqlite3)
+ if test -d $srcdir/storage/sqlite; then
+ CFLAGS="$CFLAGS $STORAGE_CFLAGS"
+ LDFLAGS="$LDFLAGS $STORAGE_LIBS"
+ fi
+
+ SQLITE_LIBS="$srcdir/storage/sqlite"
+ WRAPPER_DIR="sqlite"
+
+ ;;
+ esac ],
+ AC_MSG_RESULT(yes)
+ MYSQL_LIBS="$srcdir/storage/sqlite"
+ WRAPPER_DIR="sqlite"
+)
+
AXIS2INC=$axis2inc
AC_SUBST(AXIS2INC)
AC_SUBST(AXIOMINC)
AC_SUBST(UTILINC)
+AC_SUBST(WRAPPER_DIR)
+AC_SUBST(MYSQL_LIBS)
+AC_SUBST(SQLITE_LIBS)
AC_CONFIG_FILES([Makefile \
src/Makefile \
@@ -78,7 +132,8 @@
src/storage/Makefile\
src/storage/beans/Makefile\
src/storage/inmemory/Makefile\
- src/storage/permanent/Makefile\
+ src/storage/sqlite/Makefile\
+ src/storage/mysql/Makefile\
src/client/Makefile \
src/core/Makefile \
src/polling/Makefile
Modified: webservices/sandesha/trunk/c/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/Makefile.am?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/core/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/core/Makefile.am Tue Apr 24 23:50:59 2007
@@ -13,7 +13,7 @@
../storage/beans/libsandesha2_storage_beans.la\
../storage/libsandesha2_storage.la\
../storage/inmemory/libsandesha2_inmemory.la\
- ../storage/permanent/libsandesha2_permanent.la\
+ ../storage/${WRAPPER_DIR}/libsandesha2_permanent.la\
../transport/libsandesha2_transport.la\
../util/libsandesha_util.la\
../workers/libsandesha2_workers.la\
Modified: webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am Tue Apr 24 23:50:59 2007
@@ -13,6 +13,7 @@
INCLUDES = -I$(top_builddir)/include \
@AXIS2INC@ \
+ -I. \
-I/usr/include/mysql
EXTRA_DIST=sandesha2_sqls.h
Modified: webservices/sandesha/trunk/c/src/storage/mysql/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/mysql/permanent_storage_mgr.c?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/mysql/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/mysql/permanent_storage_mgr.c Tue Apr 24 23:50:59 2007
@@ -1147,7 +1147,7 @@
return map;
}
-MYSQL * AXIS2_CALL
+void * AXIS2_CALL
sandesha2_permanent_storage_mgr_get_dbconn(
sandesha2_storage_mgr_t *storage_mgr,
const axutil_env_t *env)
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?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c Tue Apr 24 23:50:59 2007
@@ -83,12 +83,12 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "response_str"))
+ if(0 == axutil_strcmp(col_name[i], "response_str"))
if(argv[i])
response->response_str = axutil_strdup(env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "soap_version"))
+ if(0 == axutil_strcmp(col_name[i], "soap_version"))
if(argv[i])
- response->soap_version = axis2_atoi(argv[i]);
+ response->soap_version = axutil_atoi(argv[i]);
}
return 0;
}
@@ -118,64 +118,64 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "stored_key"))
+ if(0 == axutil_strcmp(col_name[i], "stored_key"))
if(argv[i])
{
sandesha2_msg_store_bean_set_stored_key(bean, env, argv[i]);
}
- if(0 == axis2_strcmp(col_name[i], "msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "msg_id"))
if(argv[i])
sandesha2_msg_store_bean_set_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "soap_env_str"))
+ if(0 == axutil_strcmp(col_name[i], "soap_env_str"))
if(argv[i])
sandesha2_msg_store_bean_set_soap_envelope_str(bean, env,
argv[i]);
- if(0 == axis2_strcmp(col_name[i], "soap_version"))
+ if(0 == axutil_strcmp(col_name[i], "soap_version"))
if(argv[i])
sandesha2_msg_store_bean_set_soap_version(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "transport_out"))
+ if(0 == axutil_strcmp(col_name[i], "transport_out"))
if(argv[i])
sandesha2_msg_store_bean_set_transport_out(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "op"))
+ if(0 == axutil_strcmp(col_name[i], "op"))
if(argv[i])
sandesha2_msg_store_bean_set_op(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "svc"))
+ if(0 == axutil_strcmp(col_name[i], "svc"))
if(argv[i])
sandesha2_msg_store_bean_set_svc(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "svc_grp"))
+ if(0 == axutil_strcmp(col_name[i], "svc_grp"))
if(argv[i])
sandesha2_msg_store_bean_set_svc_grp(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "op_mep"))
+ if(0 == axutil_strcmp(col_name[i], "op_mep"))
if(argv[i])
sandesha2_msg_store_bean_set_op_mep(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "to_url"))
+ if(0 == axutil_strcmp(col_name[i], "to_url"))
if(argv[i])
sandesha2_msg_store_bean_set_to_url(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "transport_to"))
- if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
+ if(0 == axutil_strcmp(col_name[i], "transport_to"))
+ if(argv[i] && 0 != axutil_strcmp("(null)", argv[i]))
{
sandesha2_msg_store_bean_set_transport_to(bean, env, argv[i]);
}
- if(0 == axis2_strcmp(col_name[i], "execution_chain_str"))
+ if(0 == axutil_strcmp(col_name[i], "execution_chain_str"))
if(argv[i])
sandesha2_msg_store_bean_set_execution_chain_str(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "flow"))
+ if(0 == axutil_strcmp(col_name[i], "flow"))
if(argv[i])
sandesha2_msg_store_bean_set_flow(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_recv_str"))
+ if(0 == axutil_strcmp(col_name[i], "msg_recv_str"))
if(argv[i])
sandesha2_msg_store_bean_set_msg_recv_str(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "svr_side"))
+ if(0 == axutil_strcmp(col_name[i], "svr_side"))
if(argv[i])
sandesha2_msg_store_bean_set_svr_side(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "in_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "in_msg_store_key"))
if(argv[i])
sandesha2_msg_store_bean_set_in_msg_store_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "prop_str"))
+ if(0 == axutil_strcmp(col_name[i], "prop_str"))
if(argv[i])
sandesha2_msg_store_bean_set_persistent_property_str(bean,
env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "action"))
+ if(0 == axutil_strcmp(col_name[i], "action"))
if(argv[i])
sandesha2_msg_store_bean_set_action(bean, env, argv[i]);
}
@@ -809,13 +809,13 @@
AXIS2_LOG_INFO(env->log,
"[sandesha2]Entry:sandesha2_permanent_bean_mgr_insert_msg_store_bean");
- sql_size = axis2_strlen(msg_id) + axis2_strlen(stored_key) +
- axis2_strlen(soap_env_str) + sizeof(int) + sizeof(int) +
- axis2_strlen(op) + axis2_strlen(svc) + axis2_strlen(svc_grp) +
- axis2_strlen(op_mep) + axis2_strlen(to_url) + axis2_strlen(reply_to) +
- axis2_strlen(transport_to) + axis2_strlen(execution_chain_str) + sizeof(int) +
- axis2_strlen(msg_recv_str) + sizeof(int) + axis2_strlen(in_msg_store_key) +
- axis2_strlen(prop_str) + axis2_strlen(action) + 512;
+ sql_size = axutil_strlen(msg_id) + axutil_strlen(stored_key) +
+ axutil_strlen(soap_env_str) + sizeof(int) + sizeof(int) +
+ axutil_strlen(op) + axutil_strlen(svc) + axutil_strlen(svc_grp) +
+ axutil_strlen(op_mep) + axutil_strlen(to_url) + axutil_strlen(reply_to) +
+ axutil_strlen(transport_to) + axutil_strlen(execution_chain_str) + sizeof(int) +
+ axutil_strlen(msg_recv_str) + sizeof(int) + axutil_strlen(in_msg_store_key) +
+ axutil_strlen(prop_str) + axutil_strlen(action) + 512;
axutil_thread_mutex_lock(bean_mgr_impl->mutex);
dbconn = (sqlite3 *) sandesha2_permanent_storage_mgr_get_dbconn(
@@ -983,7 +983,7 @@
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
AXIS2_LOG_INFO(env->log,
"[sandesha2]Start:sandesha2_permanent_bean_mgr_store_response");
- sql_size = axis2_strlen(seq_id) + axis2_strlen(response) +
+ sql_size = axutil_strlen(seq_id) + axutil_strlen(response) +
sizeof(int) + sizeof(int) + 512;
sprintf(sql_stmt_count, "select count(seq_id)"\
" from response where seq_id = '%s' and msg_no=%d", seq_id, msg_no);
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_create_seq_mgr.c Tue Apr 24 23:50:59 2007
@@ -66,19 +66,19 @@
bean = sandesha2_create_seq_bean_create(env);
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "create_seq_msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "create_seq_msg_id"))
sandesha2_create_seq_bean_set_create_seq_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "internal_seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "internal_seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_internal_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "create_seq_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "create_seq_msg_store_key"))
if(argv[i])
sandesha2_create_seq_bean_set_create_seq_msg_store_key(bean, env,
argv[i]);
- if(0 == axis2_strcmp(col_name[i], "ref_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "ref_msg_store_key"))
if(argv[i])
sandesha2_create_seq_bean_set_ref_msg_store_key(bean, env, argv[i]);
}
@@ -109,19 +109,19 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "create_seq_msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "create_seq_msg_id"))
sandesha2_create_seq_bean_set_create_seq_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "internal_seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "internal_seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_internal_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_create_seq_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "create_seq_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "create_seq_msg_store_key"))
if(argv[i])
sandesha2_create_seq_bean_set_create_seq_msg_store_key(bean, env,
argv[i]);
- if(0 == axis2_strcmp(col_name[i], "ref_msg_store_key"))
+ if(0 == axutil_strcmp(col_name[i], "ref_msg_store_key"))
if(argv[i])
sandesha2_create_seq_bean_set_ref_msg_store_key(bean, env, argv[i]);
}
@@ -444,7 +444,7 @@
msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(bean, env);
temp_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(candidate,
env);
- if(msg_id && temp_msg_id && 0 != axis2_strcmp(msg_id, temp_msg_id))
+ if(msg_id && temp_msg_id && 0 != axutil_strcmp(msg_id, temp_msg_id))
{
equal = AXIS2_FALSE;
}
@@ -452,7 +452,7 @@
(sandesha2_create_seq_bean_t *) bean, env);
temp_seq_id = sandesha2_create_seq_bean_get_seq_id(
(sandesha2_create_seq_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
@@ -460,7 +460,7 @@
(sandesha2_create_seq_bean_t *) bean, env);
temp_internal_seq_id = sandesha2_create_seq_bean_get_internal_seq_id(
(sandesha2_create_seq_bean_t *) candidate, env);
- if(internal_seq_id && temp_internal_seq_id && 0 != axis2_strcmp(
+ 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_invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_invoker_mgr.c Tue Apr 24 23:50:59 2007
@@ -64,14 +64,14 @@
bean = sandesha2_invoker_bean_create(env);
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "msg_ctx_ref_key"))
+ if(0 == axutil_strcmp(col_name[i], "msg_ctx_ref_key"))
sandesha2_invoker_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_invoker_bean_set_msg_no(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_invoker_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "is_invoked"))
+ if(0 == axutil_strcmp(col_name[i], "is_invoked"))
sandesha2_invoker_bean_set_invoked(bean, env, AXIS2_ATOI(argv[i]));
}
axutil_array_list_add(data_list, env, bean);
@@ -101,14 +101,14 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "msg_ctx_ref_key"))
+ if(0 == axutil_strcmp(col_name[i], "msg_ctx_ref_key"))
sandesha2_invoker_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_invoker_bean_set_msg_no(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_invoker_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "is_invoked"))
+ if(0 == axutil_strcmp(col_name[i], "is_invoked"))
sandesha2_invoker_bean_set_invoked(bean, env, AXIS2_ATOI(argv[i]));
}
return 0;
@@ -409,7 +409,7 @@
"[sandesha2]Entry:sandesha2_permanent_create_invoker_mgr_match");
ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(bean, env);
temp_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(candidate, env);
- if(ref_key && temp_ref_key && 0 != axis2_strcmp(ref_key, temp_ref_key))
+ if(ref_key && temp_ref_key && 0 != axutil_strcmp(ref_key, temp_ref_key))
{
select = AXIS2_FALSE;
}
@@ -417,7 +417,7 @@
(sandesha2_invoker_bean_t *) bean, env);
temp_seq_id = sandesha2_invoker_bean_get_seq_id(
(sandesha2_invoker_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
select = AXIS2_FALSE;
}
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=532225&r1=532224&r2=532225
==============================================================================
--- 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 Tue Apr 24 23:50:59 2007
@@ -69,21 +69,21 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_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(0 == axutil_strcmp(col_name[i], "ref_msg_key"))
{
- if(argv[i] && 0 != axis2_strcmp("(null)", argv[i]))
+ if(argv[i] && 0 != axutil_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"))
+ if(0 == axutil_strcmp(col_name[i], "polling_mode"))
sandesha2_next_msg_bean_set_polling_mode(bean, env,
AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_next_msg_bean_set_next_msg_no_to_process(bean, env,
atol(argv[i]));
}
@@ -115,19 +115,19 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_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] && 0 != axis2_strcmp("(null)", argv[i]))
+ if(0 == axutil_strcmp(col_name[i], "ref_msg_key"))
+ if(argv[i] && 0 != axutil_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"))
+ if(0 == axutil_strcmp(col_name[i], "polling_mode"))
{
sandesha2_next_msg_bean_set_polling_mode(bean, env,
AXIS2_ATOI(argv[i]));
}
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_next_msg_bean_set_next_msg_no_to_process(bean, env,
atol(argv[i]));
}
@@ -467,7 +467,7 @@
}
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 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_sender_mgr.c Tue Apr 24 23:50:59 2007
@@ -66,33 +66,33 @@
bean = sandesha2_sender_bean_create(env);
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "msg_id"))
sandesha2_sender_bean_set_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "msg_ctx_ref_key"))
+ if(0 == axutil_strcmp(col_name[i], "msg_ctx_ref_key"))
if(argv[i])
sandesha2_sender_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "internal_seq_ID"))
+ if(0 == axutil_strcmp(col_name[i], "internal_seq_ID"))
if(argv[i])
sandesha2_sender_bean_set_internal_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "sent_count"))
+ if(0 == axutil_strcmp(col_name[i], "sent_count"))
sandesha2_sender_bean_set_sent_count(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_sender_bean_set_msg_no(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "send"))
+ if(0 == axutil_strcmp(col_name[i], "send"))
sandesha2_sender_bean_set_send(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "resend"))
+ if(0 == axutil_strcmp(col_name[i], "resend"))
sandesha2_sender_bean_set_resend(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "time_to_send"))
+ if(0 == axutil_strcmp(col_name[i], "time_to_send"))
sandesha2_sender_bean_set_time_to_send(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_type"))
+ if(0 == axutil_strcmp(col_name[i], "msg_type"))
sandesha2_sender_bean_set_msg_type(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_sender_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "wsrm_anon_uri"))
+ if(0 == axutil_strcmp(col_name[i], "wsrm_anon_uri"))
if(argv[i])
sandesha2_sender_bean_set_wsrm_anon_uri(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "to_address"))
+ if(0 == axutil_strcmp(col_name[i], "to_address"))
if(argv[i])
sandesha2_sender_bean_set_to_address(bean, env, argv[i]);
}
@@ -123,33 +123,33 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "msg_id"))
+ if(0 == axutil_strcmp(col_name[i], "msg_id"))
sandesha2_sender_bean_set_msg_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "msg_ctx_ref_key"))
+ if(0 == axutil_strcmp(col_name[i], "msg_ctx_ref_key"))
if(argv[i])
sandesha2_sender_bean_set_msg_ctx_ref_key(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "internal_seq_ID"))
+ if(0 == axutil_strcmp(col_name[i], "internal_seq_ID"))
if(argv[i])
sandesha2_sender_bean_set_internal_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "sent_count"))
+ if(0 == axutil_strcmp(col_name[i], "sent_count"))
sandesha2_sender_bean_set_sent_count(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_no"))
+ if(0 == axutil_strcmp(col_name[i], "msg_no"))
sandesha2_sender_bean_set_msg_no(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "send"))
+ if(0 == axutil_strcmp(col_name[i], "send"))
sandesha2_sender_bean_set_send(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "resend"))
+ if(0 == axutil_strcmp(col_name[i], "resend"))
sandesha2_sender_bean_set_resend(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "time_to_send"))
+ if(0 == axutil_strcmp(col_name[i], "time_to_send"))
sandesha2_sender_bean_set_time_to_send(bean, env, atol(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "msg_type"))
+ if(0 == axutil_strcmp(col_name[i], "msg_type"))
sandesha2_sender_bean_set_msg_type(bean, env, AXIS2_ATOI(argv[i]));
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
if(argv[i])
sandesha2_sender_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "wsrm_anon_uri"))
+ if(0 == axutil_strcmp(col_name[i], "wsrm_anon_uri"))
if(argv[i])
sandesha2_sender_bean_set_wsrm_anon_uri(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "to_address"))
+ if(0 == axutil_strcmp(col_name[i], "to_address"))
if(argv[i])
sandesha2_sender_bean_set_to_address(bean, env, argv[i]);
}
@@ -557,7 +557,7 @@
(sandesha2_sender_bean_t *) bean, env);
temp_ref_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
(sandesha2_sender_bean_t *) candidate, env);
- if(ref_key && temp_ref_key && 0 != axis2_strcmp(ref_key, temp_ref_key))
+ if(ref_key && temp_ref_key && 0 != axutil_strcmp(ref_key, temp_ref_key))
{
add = AXIS2_FALSE;
}
@@ -572,7 +572,7 @@
}
msg_id = sandesha2_sender_bean_get_msg_id(bean, env);
temp_msg_id = sandesha2_sender_bean_get_msg_id(candidate, env);
- if(msg_id && temp_msg_id && 0 != axis2_strcmp(msg_id, temp_msg_id))
+ if(msg_id && temp_msg_id && 0 != axutil_strcmp(msg_id, temp_msg_id))
{
add = AXIS2_FALSE;
}
@@ -581,7 +581,7 @@
temp_internal_seq_id = sandesha2_sender_bean_get_internal_seq_id(
(sandesha2_sender_bean_t *) candidate,
env);
- if(internal_seq_id && temp_internal_seq_id && 0 != axis2_strcmp(
+ if(internal_seq_id && temp_internal_seq_id && 0 != axutil_strcmp(
internal_seq_id, temp_internal_seq_id))
{
add = AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_seq_property_mgr.c Tue Apr 24 23:50:59 2007
@@ -68,12 +68,12 @@
bean = sandesha2_seq_property_bean_create(env);
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
sandesha2_seq_property_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "name"))
+ if(0 == axutil_strcmp(col_name[i], "name"))
if(argv[i])
sandesha2_seq_property_bean_set_name(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "value"))
+ if(0 == axutil_strcmp(col_name[i], "value"))
if(argv[i])
sandesha2_seq_property_bean_set_value(bean, env, argv[i]);
}
@@ -105,12 +105,12 @@
}
for(i = 0; i < argc; i++)
{
- if(0 == axis2_strcmp(col_name[i], "seq_id"))
+ if(0 == axutil_strcmp(col_name[i], "seq_id"))
sandesha2_seq_property_bean_set_seq_id(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "name"))
+ if(0 == axutil_strcmp(col_name[i], "name"))
if(argv[i])
sandesha2_seq_property_bean_set_name(bean, env, argv[i]);
- if(0 == axis2_strcmp(col_name[i], "value"))
+ if(0 == axutil_strcmp(col_name[i], "value"))
if(argv[i])
sandesha2_seq_property_bean_set_value(bean, env, argv[i]);
}
@@ -452,7 +452,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_seq_id = sandesha2_seq_property_bean_get_seq_id(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(seq_id && temp_seq_id && 0 != axis2_strcmp(seq_id, temp_seq_id))
+ if(seq_id && temp_seq_id && 0 != axutil_strcmp(seq_id, temp_seq_id))
{
equal = AXIS2_FALSE;
}
@@ -460,7 +460,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_name = sandesha2_seq_property_bean_get_name(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(name && temp_name && 0 != axis2_strcmp(name, temp_name))
+ if(name && temp_name && 0 != axutil_strcmp(name, temp_name))
{
equal = AXIS2_FALSE;
}
@@ -468,7 +468,7 @@
(sandesha2_seq_property_bean_t *) bean, env);
temp_value = sandesha2_seq_property_bean_get_value(
(sandesha2_seq_property_bean_t *) candidate, env);
- if(value && temp_value && 0 != axis2_strcmp(value, temp_value))
+ if(value && temp_value && 0 != axutil_strcmp(value, temp_value))
{
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=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_storage_mgr.c Tue Apr 24 23:50:59 2007
@@ -668,14 +668,14 @@
om_output = axiom_output_create(env, xml_writer);
if (!om_output)
{
- AXIOM_XML_WRITER_FREE(xml_writer, env);
+ axiom_xml_writer_free(xml_writer, env);
xml_writer = NULL;
return AXIS2_FAILURE;
}
axiom_output_set_soap11(om_output, env, axis2_msg_ctx_get_is_soap_11(
msg_ctx, env));
axiom_soap_envelope_serialize(envelope, env, om_output, AXIS2_FALSE);
- soap_str = (axis2_char_t *)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+ soap_str = (axis2_char_t *)axiom_xml_writer_get_xml(xml_writer, env);
if (axis2_msg_ctx_get_is_soap_11(msg_ctx, env))
soap_version = SANDESHA2_SOAP_VERSION_1_1;
else
@@ -699,7 +699,7 @@
}
if (svc)
{
- axis2_char_t *svc_name = (axis2_char_t *) AXIS2_SVC_GET_NAME(svc, env);
+ axis2_char_t *svc_name = (axis2_char_t *) axis2_svc_get_name(svc, env);
sandesha2_msg_store_bean_set_svc(bean, env, svc_name);
}
if(op)
@@ -837,7 +837,7 @@
}
msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
soap_env_str = sandesha2_msg_store_bean_get_soap_envelope_str(msg_store_bean, env);
- reader = axiom_xml_reader_create_for_memory(env, soap_env_str, axis2_strlen(
+ reader = axiom_xml_reader_create_for_memory(env, soap_env_str, axutil_strlen(
soap_env_str), NULL, AXIS2_XML_PARSER_TYPE_BUFFER);
om_builder = axiom_stax_builder_create(env, reader);
soap_version = sandesha2_msg_store_bean_get_soap_version(msg_store_bean, env);
@@ -926,7 +926,7 @@
temp = (axis2_op_t *) v;
mep = (axis2_char_t *) axis2_op_get_msg_exchange_pattern(temp,
env);
- if(0 == axis2_strcmp(mep, op_mep_str))
+ if(0 == axutil_strcmp(mep, op_mep_str))
{
op = temp;
break;
@@ -1018,7 +1018,7 @@
persistent_prop_str =
sandesha2_msg_store_bean_get_persistent_property_str(msg_store_bean,
env);
- if(persistent_prop_str && 0 != axis2_strcmp("", persistent_prop_str))
+ if(persistent_prop_str && 0 != axutil_strcmp("", persistent_prop_str))
{
axutil_hash_t *map =
sandesha2_permanent_storage_mgr_get_property_map_from_string(env,
@@ -1074,7 +1074,7 @@
prop_str = axutil_strcat(env, temp_str,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, AXIS2_WSA_VERSION,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, value, NULL);
- if(temp_str && 0 < axis2_strlen(temp_str))
+ if(temp_str && 0 < axutil_strlen(temp_str))
AXIS2_FREE(env->allocator, temp_str);
}
}
@@ -1088,17 +1088,17 @@
axis2_char_t *value = NULL;
axutil_hash_this(index, &k, NULL, &v);
key = (axis2_char_t *) k;
- if(0 == axis2_strcmp(AXIS2_HTTP_OUT_TRANSPORT_INFO, key))
+ if(0 == axutil_strcmp(AXIS2_HTTP_OUT_TRANSPORT_INFO, key))
continue;
- if(0 == axis2_strcmp(AXIS2_TRANSPORT_OUT, key))
+ if(0 == axutil_strcmp(AXIS2_TRANSPORT_OUT, key))
continue;
- if(0 == axis2_strcmp(AXIS2_TRANSPORT_IN, key))
+ if(0 == axutil_strcmp(AXIS2_TRANSPORT_IN, key))
continue;
- if(0 == axis2_strcmp(AXIS2_TRANSPORT_HEADERS, key))
+ if(0 == axutil_strcmp(AXIS2_TRANSPORT_HEADERS, key))
continue;
- if(0 == axis2_strcmp(SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, key))
+ if(0 == axutil_strcmp(SANDESHA2_ORIGINAL_TRANSPORT_OUT_DESC, key))
continue;
- if(0 == axis2_strcmp(AXIS2_HTTP_CLIENT, key))
+ if(0 == axutil_strcmp(AXIS2_HTTP_CLIENT, key))
continue;
property = (axutil_property_t *) v;
@@ -1111,7 +1111,7 @@
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR, key,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR,
value, NULL);
- if(temp_str && axis2_strlen(temp_str)> 0)
+ if(temp_str && axutil_strlen(temp_str)> 0)
AXIS2_FREE(env->allocator, temp_str);
}
}
@@ -1129,7 +1129,7 @@
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR);
if(values)
size = axutil_array_list_size(values, env);
- if((size % 2 != 0) || (size == 1 && 0 == axis2_strcmp("",
+ if((size % 2 != 0) || (size == 1 && 0 == axutil_strcmp("",
axutil_array_list_get(values, env, 0))))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -1209,12 +1209,12 @@
om_output = axiom_output_create(env, xml_writer);
if (!om_output)
{
- AXIOM_XML_WRITER_FREE(xml_writer, env);
+ axiom_xml_writer_free(xml_writer, env);
xml_writer = NULL;
return AXIS2_FAILURE;
}
axiom_soap_envelope_serialize(response, env, om_output, AXIS2_FALSE);
- response_str = (axis2_char_t *)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
+ response_str = (axis2_char_t *)axiom_xml_writer_get_xml(xml_writer, env);
sandesha2_permanent_bean_mgr_store_response(storage_mgr_impl->bean_mgr,
env, seq_id, response_str, msg_no, soap_version);
@@ -1244,7 +1244,7 @@
return NULL;
}
reader = axiom_xml_reader_create_for_memory(env, response->response_str,
- axis2_strlen(response->response_str), NULL, AXIS2_XML_PARSER_TYPE_BUFFER);
+ axutil_strlen(response->response_str), NULL, AXIS2_XML_PARSER_TYPE_BUFFER);
om_builder = axiom_stax_builder_create(env, reader);
soap_version = response->soap_version;
if(SANDESHA2_SOAP_VERSION_1_1 == soap_version)
Modified: webservices/sandesha/trunk/c/src/util/msg_init.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_init.c?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Tue Apr 24 23:50:59 2007
@@ -443,7 +443,6 @@
{
axis2_char_t *spec_version = NULL;
axis2_char_t *seq_rm_ns = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "prop_key:%s\n", prop_key);
spec_version = sandesha2_utils_get_rm_version(env, prop_key, storage_mgr);
if(spec_version)
Modified: webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_retrans_adjuster.c Tue Apr 24 23:50:59 2007
@@ -85,9 +85,6 @@
int_seq_id = sandesha2_sender_bean_get_internal_seq_id(retrans_bean, env);
seq_id = sandesha2_sender_bean_get_seq_id(retrans_bean, env);
- /* Avoid retrieving property bean from operation until it is availbale */
- /*property_bean = sandesha2_utils_get_property_bean_from_op(env,
- axis2_msg_ctx_get_op(msg_ctx, env));*/
property_bean = sandesha2_utils_get_property_bean(env,
axis2_conf_ctx_get_conf(conf_ctx, env));
sent_count = sandesha2_sender_bean_get_sent_count(retrans_bean, env) + 1;
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=532225&r1=532224&r2=532225
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Tue Apr 24 23:50:59 2007
@@ -434,9 +434,15 @@
/* This is neccessary to avoid a double free */
axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_TRANSPORT_IN, NULL);
/* Consider building soap envelope */
- AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
- successfully_sent = AXIS2_TRUE;
- sender_worker->counter++;
+ if(AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx))
+ {
+ successfully_sent = AXIS2_TRUE;
+ sender_worker->counter++;
+ }
+ else
+ {
+ successfully_sent = AXIS2_FALSE;
+ }
}
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env);
property = axis2_msg_ctx_get_property(msg_ctx, env,
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org