You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/12/11 05:29:05 UTC
svn commit: r485492 [2/3] - in /webservices/sandesha/trunk/c: ./ config/
include/ src/core/ src/msgprocessors/ src/storage/ src/storage/beans/
src/storage/inmemory/ src/util/ src/workers/
Modified: webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c?view=diff&rev=485492&r1=485491&r2=485492
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/sender_bean.c Sun Dec 10 20:28:58 2006
@@ -15,6 +15,7 @@
*/
#include <sandesha2_sender_bean.h>
+#include <sandesha2_transaction.h>
#include <sandesha2_rm_bean.h>
#include <string.h>
#include <axis2_string.h>
@@ -22,9 +23,10 @@
/*sender_bean struct */
-struct sandesha2_sender_bean_t
+typedef struct sandesha2_sender_bean_impl
{
- sandesha2_rm_bean_t *rm_bean;
+ sandesha2_sender_bean_t sender_bean;
+ sandesha2_rm_bean_t *rm_bean_impl;
axis2_char_t *msg_context_ref_key;
axis2_char_t *msg_id;
axis2_char_t *internal_seq_id;
@@ -37,40 +39,55 @@
axis2_char_t *seq_id;
axis2_char_t *wsrm_anon_uri;
axis2_char_t *to_address;
+} sandesha2_sender_bean_impl_t;
+#define SANDESHA2_INTF_TO_IMPL(sender_bean) \
+ ((sandesha2_sender_bean_impl_t *) sender_bean)
+
+static const sandesha2_rm_bean_ops_t rm_bean_ops =
+{
+ sandesha2_sender_bean_free,
+ sandesha2_sender_bean_get_base,
+ sandesha2_sender_bean_set_id,
+ sandesha2_sender_bean_get_id,
+ sandesha2_sender_bean_set_transaction,
+ sandesha2_sender_bean_get_transaction
};
-
+
AXIS2_EXTERN sandesha2_sender_bean_t* AXIS2_CALL
sandesha2_sender_bean_create(const axis2_env_t *env)
{
- sandesha2_sender_bean_t *sender = NULL;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sender = (sandesha2_sender_bean_t*) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sender_bean_t));
+ sender_bean_impl = (sandesha2_sender_bean_impl_t*) AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_sender_bean_impl_t));
- if(!sender)
+ if(!sender_bean_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
/* init properties */
- sender->msg_context_ref_key = NULL;
- sender->msg_id = NULL;
- sender->internal_seq_id = NULL;
- sender->sent_count = -1;
- sender->msg_no = -1;
- sender->send = AXIS2_FALSE;
- sender->resend = AXIS2_TRUE;
- sender->time_to_send = -1;
- sender->msg_type = 0;
- sender->seq_id = NULL;
- sender->wsrm_anon_uri = NULL;
- sender->to_address = NULL;
- sender->rm_bean = NULL;
+ sender_bean_impl->msg_context_ref_key = NULL;
+ sender_bean_impl->msg_id = NULL;
+ sender_bean_impl->internal_seq_id = NULL;
+ sender_bean_impl->sent_count = -1;
+ sender_bean_impl->msg_no = -1;
+ sender_bean_impl->send = AXIS2_FALSE;
+ sender_bean_impl->resend = AXIS2_TRUE;
+ sender_bean_impl->time_to_send = -1;
+ sender_bean_impl->msg_type = 0;
+ sender_bean_impl->seq_id = NULL;
+ sender_bean_impl->wsrm_anon_uri = NULL;
+ sender_bean_impl->to_address = NULL;
+ sender_bean_impl->rm_bean_impl = NULL;
+
+ sender_bean_impl->rm_bean_impl = sandesha2_rm_bean_create(env);
+ sender_bean_impl->sender_bean.rm_bean.ops = rm_bean_ops;
- return sender;
+ return &(sender_bean_impl->sender_bean);
}
@@ -85,341 +102,431 @@
long msg_no)
{
- sandesha2_sender_bean_t *sender = NULL;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- sender = (sandesha2_sender_bean_t*) AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_sender_bean_t));
+ sender_bean_impl = (sandesha2_sender_bean_impl_t*) AXIS2_MALLOC(env->allocator,
+ sizeof(sandesha2_sender_bean_impl_t));
- if(!sender)
+ if(!sender_bean_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
/* init properties */
- sender->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(key, env);
- sender->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
- sender->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
- sender->sent_count = -1;
- sender->msg_no = msg_no;
- sender->send = send;
- sender->resend = AXIS2_TRUE;
- sender->time_to_send = time_to_send;
- sender->msg_type = 0;
- sender->seq_id = NULL;
- sender->wsrm_anon_uri = NULL;
- sender->rm_bean = NULL;
+ sender_bean_impl->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(key, env);
+ sender_bean_impl->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
+ sender_bean_impl->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
+ sender_bean_impl->sent_count = -1;
+ sender_bean_impl->msg_no = msg_no;
+ sender_bean_impl->send = send;
+ sender_bean_impl->resend = AXIS2_TRUE;
+ sender_bean_impl->time_to_send = time_to_send;
+ sender_bean_impl->msg_type = 0;
+ sender_bean_impl->seq_id = NULL;
+ sender_bean_impl->wsrm_anon_uri = NULL;
+ sender_bean_impl->rm_bean_impl = NULL;
+ sender_bean_impl->rm_bean_impl = sandesha2_rm_bean_create(env);
+ sender_bean_impl->sender_bean.rm_bean.ops = rm_bean_ops;
- return sender;
+ return &(sender_bean_impl->sender_bean);
}
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_sender_bean_free (
- sandesha2_sender_bean_t *sender,
+ sandesha2_rm_bean_t *sender_bean,
const axis2_env_t *env)
{
- if(sender->rm_bean)
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ if(sender_bean_impl->rm_bean_impl)
{
- sandesha2_rm_bean_free(sender->rm_bean, env);
- sender->rm_bean= NULL;
+ sandesha2_rm_bean_free(sender_bean_impl->rm_bean_impl, env);
+ sender_bean_impl->rm_bean_impl = NULL;
}
- if(sender->msg_context_ref_key)
+ if(sender_bean_impl->msg_context_ref_key)
{
- AXIS2_FREE(env->allocator, sender->msg_context_ref_key);
- sender->msg_context_ref_key = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->msg_context_ref_key);
+ sender_bean_impl->msg_context_ref_key = NULL;
}
- if(sender->msg_id)
+ if(sender_bean_impl->msg_id)
{
- AXIS2_FREE(env->allocator, sender->msg_id);
- sender->msg_id = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->msg_id);
+ sender_bean_impl->msg_id = NULL;
}
- if(sender->internal_seq_id)
+ if(sender_bean_impl->internal_seq_id)
{
- AXIS2_FREE(env->allocator, sender->internal_seq_id);
- sender->internal_seq_id = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->internal_seq_id);
+ sender_bean_impl->internal_seq_id = NULL;
}
- if(sender->seq_id)
+ if(sender_bean_impl->seq_id)
{
- AXIS2_FREE(env->allocator, sender->seq_id);
- sender->seq_id = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->seq_id);
+ sender_bean_impl->seq_id = NULL;
}
- if(sender->wsrm_anon_uri)
+ if(sender_bean_impl->wsrm_anon_uri)
{
- AXIS2_FREE(env->allocator, sender->wsrm_anon_uri);
- sender->wsrm_anon_uri = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->wsrm_anon_uri);
+ sender_bean_impl->wsrm_anon_uri = NULL;
}
- return AXIS2_SUCCESS;
-
+ if(sender_bean_impl)
+ {
+ AXIS2_FREE(env->allocator, sender_bean_impl);
+ sender_bean_impl = NULL;
+ }
}
sandesha2_rm_bean_t * AXIS2_CALL
sandesha2_sender_bean_get_base(
- sandesha2_sender_bean_t* sender,
+ sandesha2_rm_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->rm_bean;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->rm_bean_impl;
}
void AXIS2_CALL
sandesha2_sender_bean_set_base (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
sandesha2_rm_bean_t* rm_bean)
{
- sender->rm_bean = rm_bean;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sender_bean_impl->rm_bean_impl = rm_bean;
}
axis2_char_t* AXIS2_CALL
sandesha2_sender_bean_get_msg_ctx_ref_key (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->msg_context_ref_key;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->msg_context_ref_key;
}
-
void AXIS2_CALL
sandesha2_sender_bean_set_msg_ctx_ref_key (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
axis2_char_t *ref_key)
{
- if(sender->msg_context_ref_key)
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ if(sender_bean_impl->msg_context_ref_key)
{
- AXIS2_FREE(env->allocator, sender->msg_context_ref_key);
- sender->msg_context_ref_key = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->msg_context_ref_key);
+ sender_bean_impl->msg_context_ref_key = NULL;
}
-
- sender->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(ref_key, env);
-
+ sender_bean_impl->msg_context_ref_key = (axis2_char_t *)AXIS2_STRDUP(ref_key, env);
}
axis2_char_t* AXIS2_CALL
sandesha2_sender_bean_get_msg_id (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->msg_id;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->msg_id;
}
void AXIS2_CALL
sandesha2_sender_bean_set_msg_id (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
axis2_char_t *msg_id)
{
- if(sender->msg_id)
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ if(sender_bean_impl->msg_id)
{
AXIS2_FREE(env->allocator, msg_id);
- sender->msg_id = NULL;
+ sender_bean_impl->msg_id = NULL;
}
-
- sender->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
+ sender_bean_impl->msg_id = (axis2_char_t *)AXIS2_STRDUP(msg_id, env);
}
-
axis2_bool_t AXIS2_CALL
sandesha2_sender_bean_is_send (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->send;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->send;
}
-
-
void AXIS2_CALL
sandesha2_sender_bean_set_send (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
axis2_bool_t send)
{
- sender->send = send;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sender_bean_impl->send = send;
}
-
axis2_char_t* AXIS2_CALL
sandesha2_sender_bean_get_internal_seq_id (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->internal_seq_id;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->internal_seq_id;
}
void AXIS2_CALL
sandesha2_sender_bean_set_internal_seq_id (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
axis2_char_t *int_seq_id)
{
- if(sender->internal_seq_id)
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ if(sender_bean_impl->internal_seq_id)
{
AXIS2_FREE(env->allocator, int_seq_id);
- sender->internal_seq_id = NULL;
+ sender_bean_impl->internal_seq_id = NULL;
}
- sender->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
+ sender_bean_impl->internal_seq_id = (axis2_char_t *)AXIS2_STRDUP(int_seq_id, env);
}
int AXIS2_CALL
sandesha2_sender_bean_get_sent_count (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->sent_count;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->sent_count;
}
-
void AXIS2_CALL
sandesha2_sender_bean_set_sent_count (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
int sent_count)
{
- sender->sent_count = sent_count;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sender_bean_impl->sent_count = sent_count;
}
-
long AXIS2_CALL
sandesha2_sender_bean_get_msg_no (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->msg_no;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->msg_no;
}
void AXIS2_CALL
sandesha2_sender_bean_set_msg_no (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
long msg_no)
{
- sender->msg_no = msg_no;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sender_bean_impl->msg_no = msg_no;
}
-
axis2_bool_t AXIS2_CALL
sandesha2_sender_bean_is_resend (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->resend;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->resend;
}
void AXIS2_CALL
sandesha2_sender_bean_set_resend (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
axis2_bool_t resend)
{
- sender->resend = resend;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sender_bean_impl->resend = resend;
}
long AXIS2_CALL
sandesha2_sender_bean_get_time_to_send (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->time_to_send;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->time_to_send;
}
void AXIS2_CALL
sandesha2_sender_bean_set_time_to_send (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
long time_to_send)
{
- sender->time_to_send = time_to_send;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sender_bean_impl->time_to_send = time_to_send;
}
int AXIS2_CALL
sandesha2_sender_bean_get_msg_type (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->msg_type;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->msg_type;
}
void AXIS2_CALL
sandesha2_sender_bean_set_msg_type (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
int msg_type)
{
- sender->msg_type = msg_type;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sender_bean_impl->msg_type = msg_type;
}
axis2_char_t* AXIS2_CALL
sandesha2_sender_bean_get_seq_id(
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->seq_id;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->seq_id;
}
void AXIS2_CALL
sandesha2_sender_bean_set_seq_id (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
axis2_char_t *seq_id)
{
- if(sender->seq_id)
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ if(sender_bean_impl->seq_id)
{
- AXIS2_FREE(env->allocator, sender->seq_id);
- sender->seq_id = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->seq_id);
+ sender_bean_impl->seq_id = NULL;
}
- sender->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
+ sender_bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
}
axis2_char_t* AXIS2_CALL
sandesha2_sender_bean_get_wsrm_anon_uri(
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->wsrm_anon_uri;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->wsrm_anon_uri;
}
void AXIS2_CALL
sandesha2_sender_bean_set_wsrm_anon_uri (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
axis2_char_t *anon_uri)
{
- if(sender->wsrm_anon_uri)
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ if(sender_bean_impl->wsrm_anon_uri)
{
- AXIS2_FREE(env->allocator, sender->wsrm_anon_uri);
- sender->wsrm_anon_uri = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->wsrm_anon_uri);
+ sender_bean_impl->wsrm_anon_uri = NULL;
}
- sender->wsrm_anon_uri = (axis2_char_t *)AXIS2_STRDUP(anon_uri, env);
+ sender_bean_impl->wsrm_anon_uri = (axis2_char_t *)AXIS2_STRDUP(anon_uri, env);
}
void AXIS2_CALL
sandesha2_sender_bean_set_to_address (
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env,
axis2_char_t *to_address)
{
- if(sender->to_address)
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ if(sender_bean_impl->to_address)
{
- AXIS2_FREE(env->allocator, sender->to_address);
- sender->to_address = NULL;
+ AXIS2_FREE(env->allocator, sender_bean_impl->to_address);
+ sender_bean_impl->to_address = NULL;
}
- sender->to_address = (axis2_char_t *)AXIS2_STRDUP(to_address, env);
+ sender_bean_impl->to_address = (axis2_char_t *)AXIS2_STRDUP(to_address, env);
}
axis2_char_t* AXIS2_CALL
sandesha2_sender_bean_get_to_address(
- sandesha2_sender_bean_t *sender,
+ sandesha2_sender_bean_t *sender_bean,
const axis2_env_t *env)
{
- return sender->to_address;
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sender_bean_impl->to_address;
}
+void AXIS2_CALL
+sandesha2_sender_bean_set_id(
+ sandesha2_rm_bean_t *sender_bean,
+ const axis2_env_t *env,
+ long id)
+{
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sandesha2_rm_bean_set_id(sender_bean_impl->rm_bean_impl, env, id);
+}
+long AXIS2_CALL
+sandesha2_sender_bean_get_id(
+ sandesha2_rm_bean_t *sender_bean,
+ const axis2_env_t *env)
+{
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sandesha2_rm_bean_get_id(sender_bean_impl->rm_bean_impl, env);
+}
+
+void AXIS2_CALL
+sandesha2_sender_bean_set_transaction(
+ sandesha2_rm_bean_t *sender_bean,
+ const axis2_env_t *env,
+ sandesha2_transaction_t *transaction)
+{
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ sandesha2_rm_bean_set_transaction(sender_bean_impl->rm_bean_impl, env,
+ transaction);
+}
+
+sandesha2_transaction_t *AXIS2_CALL
+sandesha2_sender_bean_get_transaction(
+ sandesha2_rm_bean_t *sender_bean,
+ const axis2_env_t *env)
+{
+ sandesha2_sender_bean_impl_t *sender_bean_impl = NULL;
+ sender_bean_impl = SANDESHA2_INTF_TO_IMPL(sender_bean);
+ return sandesha2_rm_bean_get_transaction(sender_bean_impl->rm_bean_impl,
+ env);
+}
Modified: webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c?view=diff&rev=485492&r1=485491&r2=485492
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/seq_property_bean.c Sun Dec 10 20:28:58 2006
@@ -15,6 +15,7 @@
*/
#include <sandesha2_seq_property_bean.h>
+#include <sandesha2_transaction.h>
#include <sandesha2_rm_bean.h>
#include <string.h>
#include <axis2_string.h>
@@ -22,37 +23,52 @@
/*seq_property_bean struct */
-struct sandesha2_seq_property_bean_t
+typedef struct sandesha2_seq_property_bean_impl
{
- sandesha2_rm_bean_t *rm_bean;
+ sandesha2_seq_property_bean_t seq_property_bean;
+ sandesha2_rm_bean_t *rm_bean_impl;
axis2_char_t *seq_id;
axis2_char_t *name;
axis2_char_t *value;
+} sandesha2_seq_property_bean_impl_t;
+
+#define SANDESHA2_INTF_TO_IMPL(seq_property_bean) \
+ ((sandesha2_seq_property_bean_impl_t *) seq_property_bean)
+
+static const sandesha2_rm_bean_ops_t rm_bean_ops =
+{
+ sandesha2_seq_property_bean_free,
+ sandesha2_seq_property_bean_get_base,
+ sandesha2_seq_property_bean_set_id,
+ sandesha2_seq_property_bean_get_id,
+ sandesha2_seq_property_bean_set_transaction,
+ sandesha2_seq_property_bean_get_transaction
};
AXIS2_EXTERN sandesha2_seq_property_bean_t* AXIS2_CALL
sandesha2_seq_property_bean_create(
const axis2_env_t *env)
{
- sandesha2_seq_property_bean_t *seq_property = NULL;
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- seq_property = (sandesha2_seq_property_bean_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_property_bean_t));
+ seq_property_bean_impl = (sandesha2_seq_property_bean_impl_t *)AXIS2_MALLOC(
+ env->allocator, sizeof(sandesha2_seq_property_bean_impl_t));
- if(!seq_property)
+ if(!seq_property_bean_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
/* initialize properties */
- seq_property->seq_id = NULL;
- seq_property->name = NULL;
- seq_property->value = NULL;
- seq_property->rm_bean = NULL;
+ seq_property_bean_impl->seq_id = NULL;
+ seq_property_bean_impl->name = NULL;
+ seq_property_bean_impl->value = NULL;
+ seq_property_bean_impl->rm_bean_impl = sandesha2_rm_bean_create(env);
+ seq_property_bean_impl->seq_property_bean.rm_bean.ops = rm_bean_ops;
- return seq_property;
+ return &(seq_property_bean_impl->seq_property_bean);
}
AXIS2_EXTERN sandesha2_seq_property_bean_t* AXIS2_CALL
@@ -63,144 +79,205 @@
axis2_char_t *value)
{
- sandesha2_seq_property_bean_t *seq_property = NULL;
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- seq_property = (sandesha2_seq_property_bean_t *)AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_property_bean_t));
+ seq_property_bean_impl = (sandesha2_seq_property_bean_impl_t *)AXIS2_MALLOC(
+ env->allocator, sizeof(sandesha2_seq_property_bean_impl_t));
- if(!seq_property)
+ if(!seq_property_bean_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
/* initialize properties */
- seq_property->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
- seq_property->name = (axis2_char_t *)AXIS2_STRDUP(prop_name, env);
- seq_property->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
- seq_property->rm_bean = NULL;
+ seq_property_bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
+ seq_property_bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(prop_name, env);
+ seq_property_bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ seq_property_bean_impl->rm_bean_impl = sandesha2_rm_bean_create(env);
+ seq_property_bean_impl->seq_property_bean.rm_bean.ops = rm_bean_ops;
- return seq_property;
+ return &(seq_property_bean_impl->seq_property_bean);
}
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_seq_property_bean_free (
- sandesha2_seq_property_bean_t *seq_property,
+ sandesha2_rm_bean_t *seq_property_bean,
const axis2_env_t *env)
{
- if(seq_property->rm_bean)
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ if(seq_property_bean_impl->rm_bean_impl)
{
- sandesha2_rm_bean_free(seq_property->rm_bean, env);
- seq_property->rm_bean= NULL;
+ sandesha2_rm_bean_free(seq_property_bean_impl->rm_bean_impl, env);
+ seq_property_bean_impl->rm_bean_impl= NULL;
}
- if(seq_property->seq_id)
+ if(seq_property_bean_impl->seq_id)
{
- AXIS2_FREE(env->allocator, seq_property->seq_id);
- seq_property->seq_id = NULL;
+ AXIS2_FREE(env->allocator, seq_property_bean_impl->seq_id);
+ seq_property_bean_impl->seq_id = NULL;
}
-
- if(seq_property->name)
+ if(seq_property_bean_impl->name)
{
- AXIS2_FREE(env->allocator, seq_property->name);
- seq_property->name = NULL;
+ AXIS2_FREE(env->allocator, seq_property_bean_impl->name);
+ seq_property_bean_impl->name = NULL;
}
-
- if(seq_property->value)
+ if(seq_property_bean_impl->value)
{
- AXIS2_FREE(env->allocator, seq_property->value);
- seq_property->value = NULL;
+ AXIS2_FREE(env->allocator, seq_property_bean_impl->value);
+ seq_property_bean_impl->value = NULL;
+ }
+ if(seq_property_bean_impl)
+ {
+ AXIS2_FREE(env->allocator, seq_property_bean_impl);
+ seq_property_bean_impl = NULL;
}
- return AXIS2_SUCCESS;
}
sandesha2_rm_bean_t * AXIS2_CALL
sandesha2_seq_property_bean_get_base(
- sandesha2_seq_property_bean_t* seq_property,
+ sandesha2_rm_bean_t *seq_property_bean,
const axis2_env_t *env)
{
- return seq_property->rm_bean;
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ return seq_property_bean_impl->rm_bean_impl;
}
void AXIS2_CALL
sandesha2_seq_property_bean_set_base (
- sandesha2_seq_property_bean_t *seq_property,
+ sandesha2_seq_property_bean_t *seq_property_bean,
const axis2_env_t *env,
sandesha2_rm_bean_t* rm_bean)
{
- seq_property->rm_bean = rm_bean;
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ seq_property_bean_impl->rm_bean_impl = rm_bean;
}
axis2_char_t *AXIS2_CALL
sandesha2_seq_property_bean_get_name (
- sandesha2_seq_property_bean_t *seq_property,
+ sandesha2_seq_property_bean_t *seq_property_bean,
const axis2_env_t *env)
{
- return seq_property->name;
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ return seq_property_bean_impl->name;
}
void AXIS2_CALL
sandesha2_seq_property_bean_set_name (
- sandesha2_seq_property_bean_t *seq_property,
+ sandesha2_seq_property_bean_t *seq_property_bean,
const axis2_env_t *env,
axis2_char_t *name)
{
- if(seq_property->name)
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ if(seq_property_bean_impl->name)
{
- AXIS2_FREE(env->allocator, seq_property->name);
- seq_property->name = NULL;
+ AXIS2_FREE(env->allocator, seq_property_bean_impl->name);
+ seq_property_bean_impl->name = NULL;
}
-
- seq_property->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
+ seq_property_bean_impl->name = (axis2_char_t *)AXIS2_STRDUP(name, env);
}
axis2_char_t *AXIS2_CALL
sandesha2_seq_property_bean_get_seq_id (
- sandesha2_seq_property_bean_t *seq_property,
+ sandesha2_seq_property_bean_t *seq_property_bean,
const axis2_env_t *env)
{
- return seq_property->seq_id;
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ return seq_property_bean_impl->seq_id;
}
void AXIS2_CALL
sandesha2_seq_property_bean_set_seq_id (
- sandesha2_seq_property_bean_t *seq_property,
+ sandesha2_seq_property_bean_t *seq_property_bean,
const axis2_env_t *env,
axis2_char_t *seq_id)
{
- if(seq_property->seq_id)
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ if(seq_property_bean_impl->seq_id)
{
- AXIS2_FREE(env->allocator, seq_property->seq_id);
- seq_property->seq_id = NULL;
+ AXIS2_FREE(env->allocator, seq_property_bean_impl->seq_id);
+ seq_property_bean_impl->seq_id = NULL;
}
-
- seq_property->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
+ seq_property_bean_impl->seq_id = (axis2_char_t *)AXIS2_STRDUP(seq_id, env);
}
axis2_char_t* AXIS2_CALL
sandesha2_seq_property_bean_get_value (
- sandesha2_seq_property_bean_t *seq_property,
+ sandesha2_seq_property_bean_t *seq_property_bean,
const axis2_env_t *env)
{
- return seq_property->value;
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ return seq_property_bean_impl->value;
}
void AXIS2_CALL
sandesha2_seq_property_bean_set_value (
- sandesha2_seq_property_bean_t *seq_property,
+ sandesha2_seq_property_bean_t *seq_property_bean,
const axis2_env_t *env,
axis2_char_t *value)
{
- if(seq_property->value)
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ if(seq_property_bean_impl->value)
{
- AXIS2_FREE(env->allocator, seq_property->value);
- seq_property->value = NULL;
+ AXIS2_FREE(env->allocator, seq_property_bean_impl->value);
+ seq_property_bean_impl->value = NULL;
}
+ seq_property_bean_impl->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
+
+}
+
+void AXIS2_CALL
+sandesha2_seq_property_bean_set_id(
+ sandesha2_rm_bean_t *seq_property_bean,
+ const axis2_env_t *env,
+ long id)
+{
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ sandesha2_rm_bean_set_id(seq_property_bean_impl->rm_bean_impl, env, id);
+}
+
+long AXIS2_CALL
+sandesha2_seq_property_bean_get_id(
+ sandesha2_rm_bean_t *seq_property_bean,
+ const axis2_env_t *env)
+{
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ return sandesha2_rm_bean_get_id(seq_property_bean_impl->rm_bean_impl, env);
+}
- seq_property->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
+void AXIS2_CALL
+sandesha2_seq_property_bean_set_transaction(
+ sandesha2_rm_bean_t *seq_property_bean,
+ const axis2_env_t *env,
+ sandesha2_transaction_t *transaction)
+{
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ sandesha2_rm_bean_set_transaction(seq_property_bean_impl->rm_bean_impl, env,
+ transaction);
+}
+sandesha2_transaction_t *AXIS2_CALL
+sandesha2_seq_property_bean_get_transaction(
+ sandesha2_rm_bean_t *seq_property_bean,
+ const axis2_env_t *env)
+{
+ sandesha2_seq_property_bean_impl_t *seq_property_bean_impl = NULL;
+ seq_property_bean_impl = SANDESHA2_INTF_TO_IMPL(seq_property_bean);
+ return sandesha2_rm_bean_get_transaction(seq_property_bean_impl->rm_bean_impl,
+ env);
}
Modified: webservices/sandesha/trunk/c/src/storage/create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/create_seq_mgr.c?view=diff&rev=485492&r1=485491&r2=485492
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/create_seq_mgr.c Sun Dec 10 20:28:58 2006
@@ -22,7 +22,7 @@
#include <axis2_thread.h>
#include <axis2_property.h>
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_create_seq_mgr_free(
sandesha2_create_seq_mgr_t *seq_mgr,
const axis2_env_t *env)
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c?view=diff&rev=485492&r1=485491&r2=485492
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c Sun Dec 10 20:28:58 2006
@@ -40,12 +40,12 @@
#define SANDESHA2_INTF_TO_IMPL(bean_mgr) \
((sandesha2_inmemory_bean_mgr_impl_t *) bean_mgr)
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_inmemory_bean_mgr_free(
sandesha2_inmemory_bean_mgr_t *bean_mgr,
const axis2_env_t *env)
{
- return bean_mgr->ops.free(bean_mgr, env);
+ bean_mgr->ops.free(bean_mgr, env);
}
axis2_bool_t AXIS2_CALL
@@ -114,7 +114,7 @@
return bean_mgr->ops.match(bean_mgr, env, bean, candidate);
}
-static axis2_status_t AXIS2_CALL
+static void AXIS2_CALL
sandesha2_inmemory_bean_mgr_free_impl(
sandesha2_inmemory_bean_mgr_t *bean_mgr,
const axis2_env_t *env);
@@ -217,13 +217,14 @@
return &(bean_mgr_impl->bean_mgr);
}
-static axis2_status_t AXIS2_CALL
+static void AXIS2_CALL
sandesha2_inmemory_bean_mgr_free_impl(
sandesha2_inmemory_bean_mgr_t *bean_mgr,
const axis2_env_t *env)
{
sandesha2_inmemory_bean_mgr_impl_t *bean_mgr_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Start:sandesha2_inmemory_bean_mgr_free_impl");
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
if(bean_mgr_impl->mutex)
@@ -241,7 +242,8 @@
AXIS2_FREE(env->allocator, bean_mgr_impl);
bean_mgr_impl = NULL;
}
- return AXIS2_SUCCESS;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_bean_mgr_free_impl");
}
static axis2_bool_t AXIS2_CALL
@@ -252,13 +254,18 @@
sandesha2_rm_bean_t *bean)
{
sandesha2_inmemory_bean_mgr_impl_t *bean_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Start:sandesha2_inmemory_bean_mgr_insert_impl");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
+ AXIS2_LOG_INFO(env->log, "came1*************************************");
axis2_hash_set(bean_mgr_impl->table, key, AXIS2_HASH_KEY_STRING, bean);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_bean_mgr_insert_impl");
return AXIS2_TRUE;
}
@@ -270,6 +277,8 @@
{
sandesha2_inmemory_bean_mgr_impl_t *bean_mgr_impl = NULL;
sandesha2_rm_bean_t *bean = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Start:sandesha2_inmemory_bean_mgr_remove_impl");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
@@ -282,6 +291,8 @@
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
axis2_hash_set(bean_mgr_impl->table, key, AXIS2_HASH_KEY_STRING, NULL);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_bean_mgr_remove_impl");
return AXIS2_TRUE;
}
@@ -293,6 +304,8 @@
{
sandesha2_inmemory_bean_mgr_impl_t *bean_mgr_impl = NULL;
sandesha2_rm_bean_t *bean = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Start:sandesha2_inmemory_bean_mgr_retrieve_impl");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
@@ -306,6 +319,8 @@
bean = (sandesha2_rm_bean_t *) axis2_hash_get(bean_mgr_impl->table,
key, AXIS2_HASH_KEY_STRING);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_bean_mgr_retrieve_impl");
return bean;
}
@@ -318,6 +333,8 @@
{
sandesha2_inmemory_bean_mgr_impl_t *bean_mgr_impl = NULL;
sandesha2_rm_bean_t *old_bean = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Start:sandesha2_inmemory_bean_mgr_update_impl");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
@@ -331,6 +348,8 @@
if(!old_bean)
return AXIS2_FALSE;
sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, old_bean);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_bean_mgr_update_impl");
return AXIS2_TRUE;
}
@@ -346,6 +365,8 @@
void *v = NULL;
int i = 0, size = 0;
axis2_bool_t remove = AXIS2_TRUE;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Start:sandesha2_inmemory_bean_mgr_find_impl");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
beans = axis2_array_list_create(env, 0);
@@ -375,6 +396,7 @@
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
/* Now we have a point-in-time view of the beans, lock them all.*/
size = AXIS2_ARRAY_LIST_SIZE(beans, env);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "size:%d", size);
for(i = 0; i < size; i++)
{
sandesha2_rm_bean_t *temp = AXIS2_ARRAY_LIST_GET(beans, env, i);
@@ -388,6 +410,8 @@
if(idx != -1)
AXIS2_ARRAY_LIST_REMOVE(beans, env, idx);
}
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_bean_mgr_find_impl");
return beans;
}
@@ -401,6 +425,8 @@
axis2_array_list_t *beans = NULL;
int i = 0, size = 0;
sandesha2_rm_bean_t *ret = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Start:sandesha2_inmemory_bean_mgr_find_unique_impl");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
@@ -418,6 +444,8 @@
ret = AXIS2_ARRAY_LIST_GET(beans, env, i);
break;
}
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_bean_mgr_find_unique_impl");
return ret;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c?view=diff&rev=485492&r1=485491&r2=485492
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_create_seq_mgr.c Sun Dec 10 20:28:58 2006
@@ -34,15 +34,13 @@
{
sandesha2_create_seq_mgr_t seq_mgr;
sandesha2_inmemory_bean_mgr_t *bean_mgr;
- axis2_hash_t *table;
- axis2_thread_mutex_t *mutex;
}sandesha2_inmemory_create_seq_mgr_t;
#define SANDESHA2_INTF_TO_IMPL(seq_mgr) \
((sandesha2_inmemory_create_seq_mgr_t *) seq_mgr)
-static axis2_status_t AXIS2_CALL
+static void AXIS2_CALL
sandesha2_inmemory_create_seq_mgr_free(
sandesha2_create_seq_mgr_t *seq_mgr,
const axis2_env_t *envv);
@@ -83,7 +81,7 @@
const axis2_env_t *env,
sandesha2_create_seq_bean_t *bean);
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_inmemory_create_seq_mgr_match(
sandesha2_inmemory_bean_mgr_t *seq_mgr,
const axis2_env_t *env,
@@ -108,82 +106,35 @@
axis2_ctx_t *ctx)
{
sandesha2_inmemory_create_seq_mgr_t *seq_mgr_impl = NULL;
- axis2_property_t *property = NULL;
-
AXIS2_ENV_CHECK(env, NULL);
seq_mgr_impl = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_inmemory_create_seq_mgr_t));
-
- seq_mgr_impl->table = NULL;
- seq_mgr_impl->mutex = NULL;
-
- seq_mgr_impl->mutex = axis2_thread_mutex_create(env->allocator,
- AXIS2_THREAD_MUTEX_DEFAULT);
- if(!seq_mgr_impl->mutex)
- {
- sandesha2_inmemory_create_seq_mgr_free(&(seq_mgr_impl->seq_mgr), env);
- return NULL;
- }
-
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- SANDESHA2_BEAN_MAP_CREATE_SEQUECE, AXIS2_FALSE);
- if(NULL != property)
- seq_mgr_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
- if(!seq_mgr_impl->table)
- {
- axis2_property_t *property = NULL;
+ sizeof(sandesha2_inmemory_create_seq_mgr_t));
- property = axis2_property_create(env);
- seq_mgr_impl->table = axis2_hash_make(env);
- if(!property || !seq_mgr_impl->table)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, seq_mgr_impl->table);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_CREATE_SEQUECE,
- property, AXIS2_FALSE);
- }
seq_mgr_impl->bean_mgr = sandesha2_inmemory_bean_mgr_create(env,
- storage_mgr, ctx, SANDESHA2_BEAN_MAP_CREATE_SEQUECE);
+ storage_mgr, ctx, SANDESHA2_BEAN_MAP_CREATE_SEQUENCE);
seq_mgr_impl->bean_mgr->ops.match = sandesha2_inmemory_create_seq_mgr_match;
seq_mgr_impl->seq_mgr.ops = create_seq_mgr_ops;
return &(seq_mgr_impl->seq_mgr);
}
-static axis2_status_t AXIS2_CALL
+static void AXIS2_CALL
sandesha2_inmemory_create_seq_mgr_free(
sandesha2_create_seq_mgr_t *seq_mgr,
const axis2_env_t *env)
{
sandesha2_inmemory_create_seq_mgr_t *seq_mgr_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
- if(seq_mgr_impl->mutex)
- {
- axis2_thread_mutex_destroy(seq_mgr_impl->mutex);
- seq_mgr_impl->mutex = NULL;
- }
if(seq_mgr_impl->bean_mgr)
{
sandesha2_inmemory_bean_mgr_free(seq_mgr_impl->bean_mgr, env);
seq_mgr_impl->bean_mgr = NULL;
}
- if(seq_mgr_impl->table)
- {
- axis2_hash_free(seq_mgr_impl->table, env);
- seq_mgr_impl->table = NULL;
- }
if(seq_mgr_impl)
{
AXIS2_FREE(env->allocator, seq_mgr_impl);
seq_mgr_impl = NULL;
}
- return AXIS2_SUCCESS;
}
static axis2_bool_t AXIS2_CALL
@@ -194,14 +145,20 @@
{
sandesha2_inmemory_create_seq_mgr_t *seq_mgr_impl = NULL;
axis2_char_t *msg_id = NULL;
+ axis2_bool_t ret = AXIS2_FALSE;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_create_seq_mgr_insert");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(bean, env);
- return sandesha2_inmemory_bean_mgr_insert(seq_mgr_impl->bean_mgr, env,
+ ret = sandesha2_inmemory_bean_mgr_insert(seq_mgr_impl->bean_mgr, env,
msg_id, (sandesha2_rm_bean_t *) bean);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_create_seq_mgr_insert");
+ return ret;
}
static axis2_bool_t AXIS2_CALL
@@ -241,7 +198,10 @@
{
sandesha2_inmemory_create_seq_mgr_t *seq_mgr_impl = NULL;
axis2_char_t *msg_id = NULL;
+ axis2_bool_t ret = AXIS2_FALSE;
+ AXIS2_LOG_INFO(env->log,
+ "Entry:[sandesha2]sandesha2_inmemory_create_seq_mgr_update");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
@@ -251,8 +211,12 @@
{
return AXIS2_FALSE;
}
- return sandesha2_inmemory_bean_mgr_update(seq_mgr_impl->bean_mgr, env,
+ ret = sandesha2_inmemory_bean_mgr_update(seq_mgr_impl->bean_mgr, env,
msg_id, (sandesha2_rm_bean_t *) bean);
+ AXIS2_LOG_INFO(env->log,
+ "Exit:[sandesha2]sandesha2_inmemory_create_seq_mgr_update:return:%d",
+ ret);
+ return ret;
}
static axis2_array_list_t *AXIS2_CALL
@@ -262,10 +226,16 @@
sandesha2_create_seq_bean_t *bean)
{
sandesha2_inmemory_create_seq_mgr_t *seq_mgr_impl = NULL;
+ axis2_array_list_t *ret = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "Entry:[sandesha2]sandesha2_inmemory_create_seq_mgr_find");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
seq_mgr_impl = SANDESHA2_INTF_TO_IMPL(seq_mgr);
- return sandesha2_inmemory_bean_mgr_find(seq_mgr_impl->bean_mgr, env,
+ ret = sandesha2_inmemory_bean_mgr_find(seq_mgr_impl->bean_mgr, env,
(sandesha2_rm_bean_t *) bean);
+ AXIS2_LOG_INFO(env->log,
+ "Exit:[sandesha2]sandesha2_inmemory_create_seq_mgr_find");
+ return ret;
}
static sandesha2_create_seq_bean_t *AXIS2_CALL
@@ -284,7 +254,7 @@
(sandesha2_rm_bean_t *) bean);
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_inmemory_create_seq_mgr_match(
sandesha2_inmemory_bean_mgr_t *seq_mgr,
const axis2_env_t *env,
@@ -298,6 +268,8 @@
axis2_char_t *temp_seq_id = NULL;
axis2_char_t *internal_seq_id = NULL;
axis2_char_t *temp_internal_seq_id = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_create_seq_mgr_match");
msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
(sandesha2_create_seq_bean_t *) bean, env);
temp_msg_id = sandesha2_create_seq_bean_get_create_seq_msg_id(
@@ -323,6 +295,9 @@
{
equal = AXIS2_FALSE;
}
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_create_seq_mgr_match:equal:%d",
+ equal);
return equal;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c?view=diff&rev=485492&r1=485491&r2=485492
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_invoker_mgr.c Sun Dec 10 20:28:58 2006
@@ -33,14 +33,12 @@
{
sandesha2_invoker_mgr_t invoker_mgr;
sandesha2_inmemory_bean_mgr_t *bean_mgr;
- axis2_hash_t *table;
- axis2_thread_mutex_t *mutex;
}sandesha2_inmemory_invoker_mgr_t;
#define SANDESHA2_INTF_TO_IMPL(invoker_mgr) \
((sandesha2_inmemory_invoker_mgr_t *) invoker_mgr)
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_inmemory_invoker_mgr_free(
sandesha2_invoker_mgr_t *invoker_mgr,
const axis2_env_t *env);
@@ -106,85 +104,35 @@
axis2_ctx_t *ctx)
{
sandesha2_inmemory_invoker_mgr_t *invoker_mgr_impl = NULL;
- axis2_property_t *property = NULL;
-
AXIS2_ENV_CHECK(env, NULL);
invoker_mgr_impl = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_inmemory_invoker_mgr_t));
-
- invoker_mgr_impl->table = NULL;
- invoker_mgr_impl->mutex = NULL;
-
- invoker_mgr_impl->mutex = axis2_thread_mutex_create(env->allocator,
- AXIS2_THREAD_MUTEX_DEFAULT);
- if(!invoker_mgr_impl->mutex)
- {
- sandesha2_inmemory_invoker_mgr_free(&(invoker_mgr_impl->invoker_mgr),
- env);
- return NULL;
- }
-
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- SANDESHA2_BEAN_MAP_STORAGE_MAP, AXIS2_FALSE);
- if(property)
- invoker_mgr_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(
- property, env);
- if(!invoker_mgr_impl->table)
- {
- axis2_property_t *property = NULL;
-
- property = axis2_property_create(env);
- invoker_mgr_impl->table = axis2_hash_make(env);
- if(!property || !invoker_mgr_impl->table)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, invoker_mgr_impl->table);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_STORAGE_MAP,
- property, AXIS2_FALSE);
- }
+ sizeof(sandesha2_inmemory_invoker_mgr_t));
invoker_mgr_impl->bean_mgr = sandesha2_inmemory_bean_mgr_create(env,
- storage_mgr, ctx, SANDESHA2_BEAN_MAP_CREATE_SEQUECE);
- invoker_mgr_impl->bean_mgr->ops.match = sandesha2_inmemory_create_invoker_mgr_match;
+ storage_mgr, ctx, SANDESHA2_BEAN_MAP_STORAGE_MAP);
+ invoker_mgr_impl->bean_mgr->ops.match =
+ sandesha2_inmemory_create_invoker_mgr_match;
invoker_mgr_impl->invoker_mgr.ops = invoker_mgr_ops;
return &(invoker_mgr_impl->invoker_mgr);
}
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_inmemory_invoker_mgr_free(
sandesha2_invoker_mgr_t *invoker_mgr,
const axis2_env_t *env)
{
sandesha2_inmemory_invoker_mgr_t *invoker_mgr_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
-
- if(invoker_mgr_impl->mutex)
- {
- axis2_thread_mutex_destroy(invoker_mgr_impl->mutex);
- invoker_mgr_impl->mutex = NULL;
- }
if(invoker_mgr_impl->bean_mgr)
{
sandesha2_inmemory_bean_mgr_free(invoker_mgr_impl->bean_mgr, env);
invoker_mgr_impl->bean_mgr = NULL;
}
- if(invoker_mgr_impl->table)
- {
- axis2_hash_free(invoker_mgr_impl->table, env);
- invoker_mgr_impl->table = NULL;
- }
-
if(invoker_mgr_impl)
{
AXIS2_FREE(env->allocator, invoker_mgr_impl);
invoker_mgr_impl = NULL;
}
- return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
@@ -194,15 +142,21 @@
sandesha2_invoker_bean_t *bean)
{
axis2_char_t *ref_key = NULL;
+ axis2_bool_t ret = AXIS2_FALSE;
sandesha2_inmemory_invoker_mgr_t *invoker_mgr_impl = NULL;
invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_invoker_mgr_insert");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(bean, env);
- return sandesha2_inmemory_bean_mgr_insert(invoker_mgr_impl->bean_mgr, env,
+ ret = sandesha2_inmemory_bean_mgr_insert(invoker_mgr_impl->bean_mgr, env,
ref_key, (sandesha2_rm_bean_t *) bean);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_invoker_mgr_insert");
+ return ret;
}
axis2_bool_t AXIS2_CALL
@@ -226,13 +180,19 @@
const axis2_env_t *env,
axis2_char_t *key)
{
+ sandesha2_invoker_bean_t *ret = NULL;
sandesha2_inmemory_invoker_mgr_t *invoker_mgr_impl = NULL;
invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_invoker_mgr_retrieve");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, key, AXIS2_FALSE);
- return (sandesha2_invoker_bean_t *) sandesha2_inmemory_bean_mgr_retrieve(
+ ret = (sandesha2_invoker_bean_t *) sandesha2_inmemory_bean_mgr_retrieve(
invoker_mgr_impl->bean_mgr, env, key);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_invoker_mgr_retrieve");
+ return ret;
}
axis2_bool_t AXIS2_CALL
@@ -242,7 +202,10 @@
sandesha2_invoker_bean_t *bean)
{
axis2_char_t *ref_key = NULL;
+ axis2_bool_t ret = AXIS2_FALSE;
sandesha2_inmemory_invoker_mgr_t *invoker_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_invoker_mgr_update");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
@@ -252,8 +215,11 @@
{
return AXIS2_FALSE;
}
- return sandesha2_inmemory_bean_mgr_update(invoker_mgr_impl->bean_mgr, env,
+ ret = sandesha2_inmemory_bean_mgr_update(invoker_mgr_impl->bean_mgr, env,
ref_key, (sandesha2_rm_bean_t *) bean);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_invoker_mgr_update:return:%d", ret);
+ return ret;
}
axis2_array_list_t *AXIS2_CALL
@@ -262,11 +228,17 @@
const axis2_env_t *env,
sandesha2_invoker_bean_t *bean)
{
+ axis2_array_list_t *ret = NULL;
sandesha2_inmemory_invoker_mgr_t *invoker_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_invoker_mgr_find");
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
invoker_mgr_impl = SANDESHA2_INTF_TO_IMPL(invoker_mgr);
- return sandesha2_inmemory_bean_mgr_find(invoker_mgr_impl->bean_mgr, env,
+ ret = sandesha2_inmemory_bean_mgr_find(invoker_mgr_impl->bean_mgr, env,
(sandesha2_rm_bean_t *) bean);
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_invoker_mgr_find");
+ return ret;
}
sandesha2_invoker_bean_t *AXIS2_CALL
@@ -301,6 +273,8 @@
axis2_bool_t is_invoked = AXIS2_FALSE;
axis2_bool_t temp_is_invoked = AXIS2_FALSE;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_create_invoker_mgr_match");
ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
(sandesha2_invoker_bean_t *) bean, env);
temp_ref_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
@@ -333,6 +307,9 @@
{
select = AXIS2_FALSE;
}
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_create_invoker_mgr_match:return:%d",
+ select);
return select;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c?view=diff&rev=485492&r1=485491&r2=485492
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c Sun Dec 10 20:28:58 2006
@@ -15,10 +15,12 @@
*/
#include <sandesha2_inmemory_next_msg_mgr.h>
+#include <sandesha2_inmemory_bean_mgr.h>
#include <sandesha2_next_msg_mgr.h>
#include <sandesha2_constants.h>
#include <sandesha2_error.h>
#include <sandesha2_utils.h>
+#include <sandesha2_storage_mgr.h>
#include <axis2_log.h>
#include <axis2_hash.h>
#include <axis2_thread.h>
@@ -31,15 +33,14 @@
typedef struct sandesha2_inmemory_next_msg_mgr
{
sandesha2_next_msg_mgr_t next_msg_mgr;
- axis2_hash_t *table;
+ sandesha2_inmemory_bean_mgr_t *bean_mgr;
axis2_array_list_t *values;
- axis2_thread_mutex_t *mutex;
}sandesha2_inmemory_next_msg_mgr_t;
#define SANDESHA2_INTF_TO_IMPL(next_msg_mgr) \
((sandesha2_inmemory_next_msg_mgr_t *) next_msg_mgr)
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_inmemory_next_msg_mgr_free(
sandesha2_next_msg_mgr_t *next_msg_mgr,
const axis2_env_t *env);
@@ -80,6 +81,13 @@
const axis2_env_t *env,
sandesha2_next_msg_bean_t *bean);
+axis2_bool_t AXIS2_CALL
+sandesha2_inmemory_next_msg_mgr_match(
+ sandesha2_inmemory_bean_mgr_t *next_msg_mgr,
+ const axis2_env_t *env,
+ sandesha2_rm_bean_t *bean,
+ sandesha2_rm_bean_t *candidate);
+
axis2_array_list_t *AXIS2_CALL
sandesha2_inmemory_next_msg_mgr_retrieve_all(
sandesha2_next_msg_mgr_t *next_msg_mgr,
@@ -100,92 +108,51 @@
AXIS2_EXTERN sandesha2_next_msg_mgr_t * AXIS2_CALL
sandesha2_inmemory_next_msg_mgr_create(
const axis2_env_t *env,
+ sandesha2_storage_mgr_t *storage_mgr,
axis2_ctx_t *ctx)
{
sandesha2_inmemory_next_msg_mgr_t *next_msg_mgr_impl = NULL;
- axis2_property_t *property = NULL;
-
AXIS2_ENV_CHECK(env, NULL);
next_msg_mgr_impl = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_inmemory_next_msg_mgr_t));
- next_msg_mgr_impl->table = NULL;
- next_msg_mgr_impl->values = NULL;
- next_msg_mgr_impl->mutex = NULL;
-
- next_msg_mgr_impl->mutex = axis2_thread_mutex_create(env->allocator,
- AXIS2_THREAD_MUTEX_DEFAULT);
- if(!next_msg_mgr_impl->mutex)
- {
- sandesha2_inmemory_next_msg_mgr_free(&(next_msg_mgr_impl->next_msg_mgr),
- env);
- return NULL;
- }
next_msg_mgr_impl->values = axis2_array_list_create(env, 0);
if(!next_msg_mgr_impl->values)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- SANDESHA2_BEAN_MAP_NEXT_MESSAGE, AXIS2_FALSE);
- if(property)
- next_msg_mgr_impl->table = (axis2_hash_t *) AXIS2_PROPERTY_GET_VALUE(
- property, env);
- if(!next_msg_mgr_impl->table)
- {
- axis2_property_t *property = NULL;
-
- property = axis2_property_create(env);
- next_msg_mgr_impl->table = axis2_hash_make(env);
- if(!property || !next_msg_mgr_impl->table)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
- AXIS2_PROPERTY_SET_VALUE(property, env, next_msg_mgr_impl->table);
- AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
- AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_BEAN_MAP_NEXT_MESSAGE,
- property, AXIS2_FALSE);
- }
- next_msg_mgr_impl->next_msg_mgr.ops = &next_msg_mgr_ops;
+ next_msg_mgr_impl->bean_mgr = sandesha2_inmemory_bean_mgr_create(env,
+ storage_mgr, ctx, SANDESHA2_BEAN_MAP_NEXT_MESSAGE);
+ next_msg_mgr_impl->bean_mgr->ops.match = sandesha2_inmemory_next_msg_mgr_match;
+ next_msg_mgr_impl->next_msg_mgr.ops = next_msg_mgr_ops;
return &(next_msg_mgr_impl->next_msg_mgr);
}
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
sandesha2_inmemory_next_msg_mgr_free(
sandesha2_next_msg_mgr_t *next_msg_mgr,
const axis2_env_t *env)
{
sandesha2_inmemory_next_msg_mgr_t *next_msg_mgr_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
- if(next_msg_mgr_impl->mutex)
+ if(next_msg_mgr_impl->bean_mgr)
{
- axis2_thread_mutex_destroy(next_msg_mgr_impl->mutex);
- next_msg_mgr_impl->mutex = NULL;
- }
- if(next_msg_mgr_impl->table)
- {
- axis2_hash_free(next_msg_mgr_impl->table, env);
- next_msg_mgr_impl->table = NULL;
+ sandesha2_inmemory_bean_mgr_free(next_msg_mgr_impl->bean_mgr, env);
+ next_msg_mgr_impl->bean_mgr = NULL;
}
if(next_msg_mgr_impl->values)
{
AXIS2_ARRAY_LIST_FREE(next_msg_mgr_impl->values, env);
next_msg_mgr_impl->values = NULL;
}
-
if(next_msg_mgr_impl)
{
AXIS2_FREE(env->allocator, next_msg_mgr_impl);
next_msg_mgr_impl = NULL;
}
- return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
@@ -207,11 +174,8 @@
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_KEY_IS_NULL, AXIS2_FAILURE);
return AXIS2_FALSE;
}
- axis2_hash_set(next_msg_mgr_impl->table, seq_id, AXIS2_HASH_KEY_STRING,
- bean);
-
- return AXIS2_TRUE;
-
+ return sandesha2_inmemory_bean_mgr_insert(next_msg_mgr_impl->bean_mgr, env,
+ seq_id, (sandesha2_rm_bean_t *) bean);
}
axis2_bool_t AXIS2_CALL
@@ -224,12 +188,8 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
-
- axis2_hash_set(next_msg_mgr_impl->table, seq_id, AXIS2_HASH_KEY_STRING,
- NULL);
-
- return AXIS2_TRUE;
-
+ return sandesha2_inmemory_bean_mgr_remove(next_msg_mgr_impl->bean_mgr, env,
+ seq_id);
}
sandesha2_next_msg_bean_t *AXIS2_CALL
@@ -238,17 +198,13 @@
const axis2_env_t *env,
axis2_char_t *seq_id)
{
- sandesha2_next_msg_bean_t *bean = NULL;
sandesha2_inmemory_next_msg_mgr_t *next_msg_mgr_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
-
- bean = (sandesha2_next_msg_bean_t *) axis2_hash_get(
- next_msg_mgr_impl->table, seq_id, AXIS2_HASH_KEY_STRING);
-
- return bean;
+ return (sandesha2_next_msg_bean_t *) sandesha2_inmemory_bean_mgr_retrieve(
+ next_msg_mgr_impl->bean_mgr, env, seq_id);
}
axis2_bool_t AXIS2_CALL
@@ -263,15 +219,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
-
seq_id = sandesha2_next_msg_bean_get_seq_id(bean, env);
if(!seq_id)
{
return AXIS2_FALSE;
}
- axis2_hash_set(next_msg_mgr_impl->table, seq_id, AXIS2_HASH_KEY_STRING,
- bean);
- return AXIS2_TRUE;
+ return sandesha2_inmemory_bean_mgr_update(next_msg_mgr_impl->bean_mgr, env,
+ seq_id, (sandesha2_rm_bean_t *) bean);
}
axis2_array_list_t *AXIS2_CALL
@@ -280,56 +234,11 @@
const axis2_env_t *env,
sandesha2_next_msg_bean_t *bean)
{
- axis2_array_list_t *beans = NULL;
- axis2_hash_index_t *i = NULL;
sandesha2_inmemory_next_msg_mgr_t *next_msg_mgr_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
-
- beans = axis2_array_list_create(env, 0);
- if(!beans)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- if(!bean)
- return beans;
- for (i = axis2_hash_first (next_msg_mgr_impl->table, env); i;
- i = axis2_hash_next (env, i))
- {
- sandesha2_next_msg_bean_t *temp = NULL;
- void *v = NULL;
- axis2_bool_t equal = AXIS2_TRUE;
- long next_msg_no = 0;
- long temp_next_msg_no = 0;
- axis2_char_t *seq_id = NULL;
- axis2_char_t *temp_seq_id = NULL;
-
- axis2_hash_this (i, NULL, NULL, &v);
- temp = (sandesha2_next_msg_bean_t *) v;
- next_msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(bean,
- env);
- temp_next_msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(
- temp, env);
- if(next_msg_no > 0 && (next_msg_no != temp_next_msg_no))
- {
- equal = AXIS2_FALSE;
- }
- seq_id = sandesha2_next_msg_bean_get_seq_id(bean, env);
- temp_seq_id = sandesha2_next_msg_bean_get_seq_id(temp, env);
- if(seq_id && temp_seq_id && 0 != AXIS2_STRCMP(seq_id, temp_seq_id))
- {
- equal = AXIS2_FALSE;
- }
- if(AXIS2_TRUE == equal)
- {
- AXIS2_ARRAY_LIST_ADD(beans, env, temp);
- }
-
- }
-
- return beans;
+ return sandesha2_inmemory_bean_mgr_find(next_msg_mgr_impl->bean_mgr, env,
+ (sandesha2_rm_bean_t *) bean);
}
sandesha2_next_msg_bean_t *AXIS2_CALL
@@ -338,34 +247,13 @@
const axis2_env_t *env,
sandesha2_next_msg_bean_t *bean)
{
- axis2_array_list_t *beans = NULL;
- int i = 0, size = 0;
- sandesha2_next_msg_bean_t *ret = NULL;
sandesha2_inmemory_next_msg_mgr_t *next_msg_mgr_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, bean, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
-
- beans = sandesha2_inmemory_next_msg_mgr_find(next_msg_mgr, env,
- bean);
- if(beans)
- size = AXIS2_ARRAY_LIST_SIZE(beans, env);
- if( size > 1)
- {
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Non-Unique result");
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_NON_UNIQUE_RESULT,
- AXIS2_FAILURE);
- return NULL;
- }
- for(i = 0; i < size; i++)
- {
- ret = AXIS2_ARRAY_LIST_GET(beans, env, i);
- break;
- }
-
-
- return ret;
+ return (sandesha2_next_msg_bean_t *)
+ sandesha2_inmemory_bean_mgr_find_unique(next_msg_mgr_impl->bean_mgr, env,
+ (sandesha2_rm_bean_t *) bean);
}
axis2_array_list_t *AXIS2_CALL
@@ -373,23 +261,49 @@
sandesha2_next_msg_mgr_t *next_msg_mgr,
const axis2_env_t *env)
{
- axis2_hash_index_t *i = NULL;
sandesha2_inmemory_next_msg_mgr_t *next_msg_mgr_impl = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
+ return sandesha2_inmemory_bean_mgr_find(next_msg_mgr_impl->bean_mgr, env,
+ NULL);
+}
- for (i = axis2_hash_first (next_msg_mgr_impl->table, env); i;
- i = axis2_hash_next (env, i))
- {
- sandesha2_next_msg_bean_t *bean = NULL;
- void *v = NULL;
-
- axis2_hash_this (i, NULL, NULL, &v);
- bean = (sandesha2_next_msg_bean_t *) v;
- AXIS2_ARRAY_LIST_ADD(next_msg_mgr_impl->values, env, bean);
- }
-
- return next_msg_mgr_impl->values;
+axis2_bool_t AXIS2_CALL
+sandesha2_inmemory_next_msg_mgr_match(
+ sandesha2_inmemory_bean_mgr_t *next_msg_mgr,
+ const axis2_env_t *env,
+ sandesha2_rm_bean_t *bean,
+ sandesha2_rm_bean_t *candidate)
+{
+ axis2_bool_t equal = AXIS2_TRUE;
+ long next_msg_no = 0;
+ long temp_next_msg_no = 0;
+ axis2_char_t *seq_id = NULL;
+ axis2_char_t *temp_seq_id = NULL;
+ sandesha2_inmemory_next_msg_mgr_t *next_msg_mgr_impl = NULL;
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Entry:sandesha2_inmemory_next_msg_mgr_match");
+ AXIS2_ENV_CHECK(env, AXIS2_FALSE);
+ next_msg_mgr_impl = SANDESHA2_INTF_TO_IMPL(next_msg_mgr);
+ next_msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(
+ (sandesha2_next_msg_bean_t *) bean, env);
+ temp_next_msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(
+ (sandesha2_next_msg_bean_t *) candidate, env);
+ if(next_msg_no > 0 && (next_msg_no != temp_next_msg_no))
+ {
+ equal = AXIS2_FALSE;
+ }
+ seq_id = sandesha2_next_msg_bean_get_seq_id(
+ (sandesha2_next_msg_bean_t *) bean, env);
+ temp_seq_id = sandesha2_next_msg_bean_get_seq_id(
+ (sandesha2_next_msg_bean_t *) candidate, env);
+ if(seq_id && temp_seq_id && 0 != AXIS2_STRCMP(seq_id, temp_seq_id))
+ {
+ equal = AXIS2_FALSE;
+ }
+ AXIS2_LOG_INFO(env->log,
+ "[sandesha2]Exit:sandesha2_inmemory_next_msg_mgr_match:equal:%d",
+ equal);
+ return equal;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org