Author: damitha
Date: Fri Jan 4 18:32:36 2008
New Revision: 609084
URL: http://svn.apache.org/viewvc?rev=609084&view=rev
Log:
fixing memory leaks
Modified:
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/msg_init.c
webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?rev=609084&r1=609083&r2=609084&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Fri Jan 4 18:32:36 2008
@@ -50,7 +50,7 @@
axis2_op_t *ack_op = NULL;
axis2_op_t *ref_op = NULL;
axis2_msg_ctx_t *ack_msg_ctx = NULL;
- axis2_char_t *addr_ns_uri = NULL;
+ /*axis2_char_t *addr_ns_uri = NULL;*/
axutil_property_t *property = NULL;
sandesha2_msg_ctx_t *ack_rm_msg = NULL;
axiom_soap_envelope_t *soap_env = NULL;
@@ -117,7 +117,7 @@
/* Adding the sequence acknowledgement part */
sandesha2_msg_creator_add_ack_msg(env, ack_rm_msg, seq_id, seq_prop_mgr);
axis2_msg_ctx_set_property(ack_msg_ctx, env, AXIS2_TRANSPORT_IN, NULL);
- addr_ns_uri = sandesha2_utils_get_seq_property(env, seq_id,
+ /*addr_ns_uri = sandesha2_utils_get_seq_property(env, seq_id,
SANDESHA2_SEQ_PROP_ADDRESSING_NAMESPACE_VALUE, seq_prop_mgr);
if(addr_ns_uri)
{
@@ -133,7 +133,7 @@
}
if(addr_ns_uri)
AXIS2_FREE(env->allocator, addr_ns_uri);
- }
+ }*/
op_ctx = axis2_msg_ctx_get_op_ctx(ref_msg, env);
if(!op_ctx)
{
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?rev=609084&r1=609083&r2=609084&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Fri Jan 4 18:32:36 2008
@@ -311,9 +311,9 @@
sandesha2_seq_property_mgr_t *seq_prop_mgr)
{
axis2_conf_ctx_t *conf_ctx = NULL;
- axis2_ctx_t *ctx = NULL;
+ /*axis2_ctx_t *ctx = NULL;
+ axutil_property_t *prop = NULL;*/
axis2_msg_ctx_t *temp_msg_ctx = NULL;
- axutil_property_t *prop = NULL;
axis2_char_t *rm_version = NULL;
axis2_char_t *rm_ns_value = NULL;
axis2_char_t *addressing_ns_value = NULL;
@@ -399,17 +399,19 @@
rm_version);*/
soap_action = axutil_string_create(env, temp_action);
axis2_msg_ctx_set_soap_action(out_msg, env, soap_action);
- ctx = axis2_msg_ctx_get_base(out_msg, env);
+ /*ctx = axis2_msg_ctx_get_base(out_msg, env);
prop = axis2_ctx_get_property(ctx, env, AXIS2_WSA_VERSION);
if(prop)
{
- axutil_property_set_value(prop, env, addressing_ns_value);
+ axutil_property_set_value(prop, env, axutil_strdup(env,
+ addressing_ns_value));
}
else
{
- prop = axutil_property_create_with_args(env, 0, 0, 0,
addressing_ns_value);
+ prop = axutil_property_create_with_args(env, 0, 0, 0,
axutil_strdup(env,
+ addressing_ns_value));
axis2_ctx_set_property(ctx, env, AXIS2_WSA_VERSION, prop);
- }
+ }*/
if(addressing_ns_value)
AXIS2_FREE(env->allocator, addressing_ns_value);
new_msg_id = axutil_uuid_gen(env);
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?rev=609084&r1=609083&r2=609084&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_init.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_init.c Fri Jan 4 18:32:36 2008
@@ -263,6 +263,8 @@
sandesha2_msg_ctx_set_addr_ns_val(rm_msg_ctx, env,
addressing_ns_value);
}
+ if(rm_elements)
+ sandesha2_rm_elements_free(rm_elements, env);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/rm_elements.c?rev=609084&r1=609083&r2=609084&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Fri Jan 4 18:32:36 2008
@@ -53,8 +53,6 @@
axis2_char_t *addr_ns_val)
{
sandesha2_rm_elements_t *rm_elements = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
rm_elements = (sandesha2_rm_elements_t *)AXIS2_MALLOC
(env->allocator, sizeof(sandesha2_rm_elements_t));
if(!rm_elements)
@@ -86,12 +84,16 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(rm_elements->addr_ns_val)
{
AXIS2_FREE(env->allocator, rm_elements->addr_ns_val);
rm_elements->addr_ns_val = NULL;
}
+ if(rm_elements->rm_ns_val)
+ {
+ AXIS2_FREE(env->allocator, rm_elements->rm_ns_val);
+ rm_elements->rm_ns_val = NULL;
+ }
AXIS2_FREE(env->allocator, rm_elements);
return AXIS2_SUCCESS;
}
@@ -136,22 +138,21 @@
axis2_char_t *rm_ns_val = NULL;
axis2_char_t *addr_ns_val = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, soap_envelope, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, action, AXIS2_FAILURE);
soap_version = axiom_soap_envelope_get_soap_version(soap_envelope, env);
- rm_elements->rm_ns_val = sandesha2_rm_elements_get_rm_ns_val(rm_elements,
- env, soap_envelope, action);
+ rm_elements->rm_ns_val = axutil_strdup(env,
+ sandesha2_rm_elements_get_rm_ns_val(rm_elements, env, soap_envelope,
+ action));
if(!rm_elements->rm_ns_val)
return AXIS2_SUCCESS;
- rm_elements->addr_ns_val =
- sandesha2_rm_elements_get_addr_ns_val_from_env(
- rm_elements, env, soap_envelope, action);
+ rm_elements->addr_ns_val = axutil_strdup(env,
+ sandesha2_rm_elements_get_addr_ns_val_from_env(rm_elements, env,
+ soap_envelope, action));
if(!rm_elements->addr_ns_val)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[sandesha2] Cannot find the"
@@ -326,8 +327,6 @@
axiom_soap_body_t *soap_body = NULL;
axiom_node_t *body_node = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, soap_envelope, NULL);
soap_header = axiom_soap_envelope_get_header(soap_envelope, env);
@@ -392,8 +391,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->create_seq;
}
@@ -403,7 +400,6 @@
const axutil_env_t *env,
sandesha2_create_seq_t *create_seq)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, create_seq, AXIS2_FAILURE);
rm_elements->create_seq = create_seq;
return AXIS2_SUCCESS;
@@ -414,8 +410,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->create_seq_res;
}
@@ -425,7 +419,6 @@
const axutil_env_t *env,
sandesha2_create_seq_res_t *create_seq_res)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, create_seq_res, AXIS2_FAILURE);
rm_elements->create_seq_res = create_seq_res;
return AXIS2_SUCCESS;
@@ -436,8 +429,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->seq;
}
@@ -447,7 +438,6 @@
const axutil_env_t *env,
sandesha2_seq_t *seq)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq, AXIS2_FAILURE);
rm_elements->seq = seq;
return AXIS2_SUCCESS;
@@ -458,8 +448,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->seq_ack;
}
@@ -469,7 +457,6 @@
const axutil_env_t *env,
sandesha2_seq_ack_t *seq_ack)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_ack, AXIS2_FAILURE);
rm_elements->seq_ack = seq_ack;
return AXIS2_SUCCESS;
@@ -480,8 +467,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->terminate_seq;
}
@@ -491,7 +476,6 @@
const axutil_env_t *env,
sandesha2_terminate_seq_t *terminate_seq)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, terminate_seq, AXIS2_FAILURE);
rm_elements->terminate_seq = terminate_seq;
return AXIS2_SUCCESS;
@@ -502,8 +486,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->terminate_seq_res;
}
@@ -513,7 +495,6 @@
const axutil_env_t *env,
sandesha2_terminate_seq_res_t *terminate_seq_res)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, terminate_seq_res, AXIS2_FAILURE);
rm_elements->terminate_seq_res = terminate_seq_res;
return AXIS2_SUCCESS;
@@ -524,8 +505,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->ack_requested;
}
@@ -535,7 +514,6 @@
const axutil_env_t *env,
sandesha2_ack_requested_t *ack_requested)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ack_requested, AXIS2_FAILURE);
rm_elements->ack_requested = ack_requested;
return AXIS2_SUCCESS;
@@ -546,8 +524,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->close_seq;
}
@@ -557,7 +533,6 @@
const axutil_env_t *env,
sandesha2_close_seq_t *close_seq)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, close_seq, AXIS2_FAILURE);
rm_elements->close_seq = close_seq;
return AXIS2_SUCCESS;
@@ -568,8 +543,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->close_seq_res;
}
@@ -579,7 +552,6 @@
const axutil_env_t *env,
sandesha2_close_seq_res_t *close_seq_res)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, close_seq_res, AXIS2_FAILURE);
rm_elements->close_seq_res = close_seq_res;
return AXIS2_SUCCESS;
@@ -590,8 +562,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->addr_ns_val;
}
@@ -600,8 +570,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->make_connection;
}
@@ -610,8 +578,6 @@
sandesha2_rm_elements_t *rm_elements,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return rm_elements->msg_pending;
}
@@ -624,7 +590,6 @@
{
axiom_soap_header_t *soap_header = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, soap_envelope, NULL);
AXIS2_PARAM_CHECK(env->error, action, NULL);
@@ -684,7 +649,6 @@
{
axiom_soap_header_t *soap_header = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, soap_envelope, NULL);
AXIS2_PARAM_CHECK(env->error, action, NULL);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
