Author: damitha
Date: Wed Jan 30 00:20:56 2008
New Revision: 616680
URL: http://svn.apache.org/viewvc?rev=616680&view=rev
Log:
Fixing memory leaks
Modified:
webservices/sandesha/trunk/c/config/axis2.xml
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
Modified: webservices/sandesha/trunk/c/config/axis2.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/axis2.xml?rev=616680&r1=616679&r2=616680&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/config/axis2.xml (original)
+++ webservices/sandesha/trunk/c/config/axis2.xml Wed Jan 30 00:20:56 2008
@@ -28,20 +28,6 @@
<parameter name="port" locked="false">6060</parameter>
</transportReceiver>
- <!-- Uncomment this one with the appropriate papameters to enable the SMTP
transport Receiver
- <transportReceiver name="mail"
class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host"
locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user"
locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.password"
locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.port"
locked="false">110</parameter>
- <parameter name="transport.mail.replyToAddress"
locked="false">[EMAIL PROTECTED]</parameter>
- </transportReceiver> -->
-
- <!--
- <transportReceiver name="tcp"
class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
- </transportReceiver>
- -->
<!-- ================================================= -->
<!-- Transport Outs -->
<!-- ================================================= -->
Modified:
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?rev=616680&r1=616679&r2=616680&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
(original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Wed
Jan 30 00:20:56 2008
@@ -103,7 +103,7 @@
const axis2_char_t *wsa_action = NULL;
const axis2_char_t *soap_action = NULL;
axis2_bool_t is_rm_global_msg = AXIS2_FALSE;
- sandesha2_msg_ctx_t *rm_msg_ctx = NULL;
+ /*sandesha2_msg_ctx_t *rm_msg_ctx = NULL;*/
axis2_bool_t isolated_last_msg = AXIS2_FALSE;
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
@@ -207,8 +207,6 @@
return AXIS2_SUCCESS; // Reinjected Messages are not processed by
sandesha2 inflow handlers
}*/
- /*if(!sandesha2_permanent_storage_mgr_create_db(env, conf_ctx))
- return AXIS2_FAILURE;*/
fault_part = axiom_soap_body_get_fault(axiom_soap_envelope_get_body(
soap_envelope, env), env);
if(fault_part)
@@ -242,11 +240,11 @@
}
}
}
- if(!sandesha2_permanent_storage_mgr_create_db(env, conf_ctx))
+ /*if(!sandesha2_permanent_storage_mgr_create_db(env, conf_ctx))
{
return AXIS2_FAILURE;
}
- rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);
+ rm_msg_ctx = sandesha2_msg_init_init_msg(env, msg_ctx);*/
/*if(!isolated_last_msg)
dropped = sandesha2_global_in_handler_drop_if_duplicate(handler, env,
rm_msg_ctx);
@@ -258,8 +256,8 @@
return AXIS2_SUCCESS;
}*/
/*Process if global processing possible. - Currently none*/
- if(rm_msg_ctx)
- sandesha2_msg_ctx_free(rm_msg_ctx, env);
+ /*if(rm_msg_ctx)
+ sandesha2_msg_ctx_free(rm_msg_ctx, env);*/
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[sandesha2]Exit:sandesha2_global_in_handler");
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c?rev=616680&r1=616679&r2=616680&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_in_handler.c Wed Jan 30
00:20:56 2008
@@ -95,6 +95,10 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
+ if(!sandesha2_permanent_storage_mgr_create_db(env, conf_ctx))
+ {
+ return AXIS2_FAILURE;
+ }
ctx = axis2_msg_ctx_get_base(msg_ctx, env);
temp_prop = axis2_ctx_get_property(ctx, env,
SANDESHA2_APPLICATION_PROCESSING_DONE);
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?rev=616680&r1=616679&r2=616680&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Wed Jan 30
00:20:56 2008
@@ -389,13 +389,15 @@
msg_type != SANDESHA2_MSG_TYPE_CREATE_SEQ)
{
axis2_char_t *msg_stored_key = NULL;
- msg_id = sandesha2_sender_bean_get_msg_id(bean1, env);
- sandesha2_sender_mgr_remove(sender_mgr, env, msg_id);
- /* Removing the message from the storage */
- msg_stored_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
- bean1, env);
- sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
- msg_stored_key, conf_ctx, -1);
+ if(bean1)
+ {
+ msg_id = sandesha2_sender_bean_get_msg_id(bean1, env);
+ sandesha2_sender_mgr_remove(sender_mgr, env, msg_id);
+ msg_stored_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
+ bean1, env);
+ sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
+ msg_stored_key, conf_ctx, -1);
+ }
}
if(bean1)
sandesha2_sender_bean_free(bean1, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
