Author: damitha
Date: Wed Jan 23 02:01:00 2008
New Revision: 614473
URL: http://svn.apache.org/viewvc?rev=614473&view=rev
Log:
fixing memory leaks
Modified:
webservices/sandesha/trunk/c/include/sandesha2_accept.h
webservices/sandesha/trunk/c/include/sandesha2_ack_final.h
webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/property_bean.c
webservices/sandesha/trunk/c/src/util/property_mgr.c
webservices/sandesha/trunk/c/src/wsrm/accept.c
webservices/sandesha/trunk/c/src/wsrm/ack_final.c
Modified: webservices/sandesha/trunk/c/include/sandesha2_accept.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_accept.h?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_accept.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_accept.h Wed Jan 23 02:01:00
2008
@@ -69,6 +69,18 @@
sandesha2_accept_t *accept,
const axutil_env_t *env);
+void* AXIS2_CALL
+sandesha2_accept_from_om_node(
+ sandesha2_accept_t *accept,
+ const axutil_env_t *env,
+ axiom_node_t *om_node);
+
+axiom_node_t* AXIS2_CALL
+sandesha2_accept_to_om_node(
+ sandesha2_accept_t *accept,
+ const axutil_env_t *env,
+ void *om_node);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/include/sandesha2_ack_final.h
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/include/sandesha2_ack_final.h?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/include/sandesha2_ack_final.h (original)
+++ webservices/sandesha/trunk/c/include/sandesha2_ack_final.h Wed Jan 23
02:01:00 2008
@@ -23,6 +23,8 @@
*/
#include <axutil_env.h>
+#include <axiom_node.h>
+#include <axiom_element.h>
#ifdef __cplusplus
extern "C"
@@ -54,6 +56,18 @@
sandesha2_ack_final_get_namespace_value(
sandesha2_ack_final_t *ack_final,
const axutil_env_t *env);
+
+void* AXIS2_CALL
+sandesha2_ack_final_from_om_node(
+ sandesha2_ack_final_t *ack_final,
+ const axutil_env_t *env,
+ axiom_node_t *om_node);
+
+axiom_node_t* AXIS2_CALL
+sandesha2_ack_final_to_om_node(
+ sandesha2_ack_final_t *ack_final,
+ const axutil_env_t *env, void *om_node);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c (original)
+++ webservices/sandesha/trunk/c/src/core/sandesha2_msg_ctx.c Wed Jan 23
02:01:00 2008
@@ -17,7 +17,6 @@
#include <sandesha2_constants.h>
#include <axutil_hash.h>
#include <axiom_soap_const.h>
-#include <sandesha2_iom_rm_part.h>
#include <stdio.h>
#include <sandesha2_close_seq.h>
#include <sandesha2_close_seq_res.h>
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?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- 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
Wed Jan 23 02:01:00 2008
@@ -35,7 +35,7 @@
sandesha2_next_msg_mgr_t next_msg_mgr;
sandesha2_permanent_bean_mgr_t *bean_mgr;
axutil_array_list_t *values;
-}sandesha2_permanent_next_msg_mgr_t;
+} sandesha2_permanent_next_msg_mgr_t;
#define SANDESHA2_INTF_TO_IMPL(next_msg_mgr) \
((sandesha2_permanent_next_msg_mgr_t *) next_msg_mgr)
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Wed Jan 23 02:01:00 2008
@@ -21,7 +21,6 @@
#include <axutil_hash.h>
#include <axis2_core_utils.h>
#include <axiom_soap_const.h>
-#include <sandesha2_iom_rm_part.h>
#include <sandesha2_create_seq.h>
#include <sandesha2_seq_ack.h>
#include <sandesha2_seq.h>
Modified: webservices/sandesha/trunk/c/src/util/property_bean.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_bean.c?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_bean.c Wed Jan 23 02:01:00
2008
@@ -29,8 +29,6 @@
long ack_interval;
long retrans_interval;
axis2_bool_t is_exp_backoff;
- axis2_char_t *in_mem_storage_mgr;
- axis2_char_t *permanent_storage_mgr;
axis2_char_t *storage_mgr;
axis2_bool_t is_in_order;
axutil_array_list_t *msg_types_to_drop;
@@ -56,8 +54,6 @@
bean->ack_interval = 0;
bean->retrans_interval = 0;
bean->is_exp_backoff = 0;
- bean->in_mem_storage_mgr = NULL;
- bean->permanent_storage_mgr= NULL;
bean->storage_mgr= NULL;
bean->is_in_order = AXIS2_FALSE;
bean->msg_types_to_drop = NULL;
@@ -92,15 +88,10 @@
AXIS2_FREE(env->allocator, bean->db_path);
bean->db_path = NULL;
}
- if(bean->in_mem_storage_mgr)
+ if(bean->storage_mgr)
{
- AXIS2_FREE(env->allocator, bean->in_mem_storage_mgr);
- bean->in_mem_storage_mgr = NULL;
- }
- if(bean->permanent_storage_mgr)
- {
- AXIS2_FREE(env->allocator, bean->permanent_storage_mgr);
- bean->permanent_storage_mgr = NULL;
+ AXIS2_FREE(env->allocator, bean->storage_mgr);
+ bean->storage_mgr = NULL;
}
AXIS2_FREE(env->allocator, bean);
return AXIS2_SUCCESS;
@@ -209,42 +200,6 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_in_mem_storage_mgr(
- sandesha2_property_bean_t *bean,
- const axutil_env_t *env)
-{
- return bean->in_mem_storage_mgr;
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_in_mem_storage_mgr(
- sandesha2_property_bean_t *bean,
- const axutil_env_t *env, axis2_char_t *manager)
-{
- AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- bean->in_mem_storage_mgr = axutil_strdup(env, manager);
- return AXIS2_SUCCESS;
-}
-
-axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_permanent_storage_mgr(
- sandesha2_property_bean_t *bean,
- const axutil_env_t *env)
-{
- return bean->permanent_storage_mgr;
-}
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_permanent_storage_mgr(
- sandesha2_property_bean_t *bean,
- const axutil_env_t *env, axis2_char_t *manager)
-{
- AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- bean->permanent_storage_mgr = axutil_strdup(env, manager);
- return AXIS2_SUCCESS;
-}
-
axis2_char_t* AXIS2_CALL
sandesha2_property_bean_get_storage_mgr(
sandesha2_property_bean_t *bean,
Modified: webservices/sandesha/trunk/c/src/util/property_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_mgr.c?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Wed Jan 23 02:01:00
2008
@@ -59,18 +59,6 @@
sandesha2_property_bean_t *property_bean);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_property_mgr_load_in_mem_storage_mgr(
- const axutil_env_t *env,
- axis2_char_t *value,
- sandesha2_property_bean_t *property_bean);
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_property_mgr_load_perm_storage_mgr(
- const axutil_env_t *env,
- axis2_char_t *value,
- sandesha2_property_bean_t *property_bean);
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_property_mgr_load_in_order_invocation(
const axutil_env_t *env,
axis2_char_t *value,
@@ -98,10 +86,6 @@
sandesha2_property_bean_set_inactive_timeout_interval_with_units(
property_bean, env, SANDESHA2_DEF_VAL_INACTIVETIMEOUT,
SANDESHA2_DEF_VAL_INACTIVETIMEOUT_MEASURE);
- sandesha2_property_bean_set_in_mem_storage_mgr(property_bean, env,
- SANDESHA2_DEF_VAL_IN_MEMORY_STORAGE_MGR);
- sandesha2_property_bean_set_permanent_storage_mgr(property_bean, env,
- SANDESHA2_DEF_VAL_PERM_STORAGE_MGR);
sandesha2_property_bean_set_in_order(property_bean, env,
SANDESHA2_DEF_VAL_INORDER_INVOCATION);
sandesha2_property_bean_set_msg_types_to_drop(property_bean, env, NULL);
@@ -124,8 +108,6 @@
axis2_char_t *retrans_int_str = NULL;
axis2_char_t *ack_int_str = NULL;
axis2_char_t *inactive_timeout_str = NULL;
- axis2_char_t *in_mem_mgr_str = NULL;
- axis2_char_t *perm_mgr_str = NULL;
axis2_char_t *in_order_invoker_str = NULL;
axis2_char_t *msg_types_str = NULL;
@@ -179,24 +161,6 @@
}
param = axis2_module_desc_get_param(module_desc, env,
- SANDESHA2_PROPERTIES_IN_MEMORY_STORAGE_MGR);
- if(param)
- {
- in_mem_mgr_str = axutil_param_get_value(param, env);
- sandesha2_property_mgr_load_in_mem_storage_mgr(env, in_mem_mgr_str,
- property_bean);
- }
-
- param = axis2_module_desc_get_param(module_desc, env,
- SANDESHA2_PROPERTIES_PERM_STORAGE_MGR);
- if(param)
- {
- perm_mgr_str = axutil_param_get_value(param, env);
- sandesha2_property_mgr_load_perm_storage_mgr(env, perm_mgr_str,
- property_bean);
- }
-
- param = axis2_module_desc_get_param(module_desc, env,
SANDESHA2_PROPERTIES_INORDER_INVOCATION);
if(param)
{
@@ -348,35 +312,6 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_property_mgr_load_in_mem_storage_mgr(
- const axutil_env_t *env,
- axis2_char_t *value,
- sandesha2_property_bean_t *property_bean)
-{
- AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
-
- sandesha2_property_bean_set_in_mem_storage_mgr(property_bean, env, value);
-
- return AXIS2_SUCCESS;
-}
-
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-sandesha2_property_mgr_load_perm_storage_mgr(
- const axutil_env_t *env,
- axis2_char_t *value,
- sandesha2_property_bean_t *property_bean)
-{
- AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
-
- sandesha2_property_bean_set_permanent_storage_mgr(property_bean, env,
- value);
-
- return AXIS2_SUCCESS;
-}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
sandesha2_property_mgr_load_in_order_invocation(
const axutil_env_t *env,
Modified: webservices/sandesha/trunk/c/src/wsrm/accept.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/accept.c?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/accept.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/accept.c Wed Jan 23 02:01:00 2008
@@ -29,25 +29,10 @@
axis2_char_t *addr_ns_val;
};
-/***************************** Function headers
*******************************/
-
-void* AXIS2_CALL
-sandesha2_accept_from_om_node(
- sandesha2_accept_t *accept,
- const axutil_env_t *env,
- axiom_node_t *om_node);
-
-axiom_node_t* AXIS2_CALL
-sandesha2_accept_to_om_node(
- sandesha2_accept_t *accept,
- const axutil_env_t *env,
- void *om_node);
-
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_accept_is_namespace_supported(
const axutil_env_t *env,
axis2_char_t *namespace);
-/***************************** End of function headers
************************/
AXIS2_EXTERN sandesha2_accept_t* AXIS2_CALL
sandesha2_accept_create(
@@ -216,7 +201,7 @@
return accept->acks_to;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_accept_is_namespace_supported(
const axutil_env_t *env,
axis2_char_t *namespace)
Modified: webservices/sandesha/trunk/c/src/wsrm/ack_final.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_final.c?rev=614473&r1=614472&r2=614473&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_final.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_final.c Wed Jan 23 02:01:00 2008
@@ -16,8 +16,6 @@
#include <sandesha2_ack_final.h>
#include <sandesha2_constants.h>
-#include <axiom_node.h>
-#include <axiom_element.h>
#include <sandesha2_error.h>
/**
* @brief AckFinal struct impl
@@ -27,26 +25,12 @@
{
axis2_char_t *ns_val;
};
-
-/***************************** Function headers
*******************************/
-void* AXIS2_CALL
-sandesha2_ack_final_from_om_node(
- sandesha2_ack_final_t *ack_final,
- const axutil_env_t *env,
- axiom_node_t *om_node);
-
-axiom_node_t* AXIS2_CALL
-sandesha2_ack_final_to_om_node(
- sandesha2_ack_final_t *ack_final,
- const axutil_env_t *env, void *om_node);
-
-axis2_bool_t AXIS2_CALL
+
+static axis2_bool_t AXIS2_CALL
sandesha2_ack_final_is_namespace_supported(
const axutil_env_t *env,
axis2_char_t *namespace);
-/***************************** End of function headers
************************/
-
AXIS2_EXTERN sandesha2_ack_final_t* AXIS2_CALL
sandesha2_ack_final_create(
const axutil_env_t *env,
@@ -160,7 +144,7 @@
return (axiom_node_t*)om_node;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_ack_final_is_namespace_supported(
const axutil_env_t *env,
axis2_char_t *namespace)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
