You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2006/03/24 01:12:08 UTC

svn commit: r388303 - in /webservices/axis2/trunk/c/modules/core: description/transport_in_desc.c description/transport_out_desc.c transport/http/receiver/http_server.c

Author: samisa
Date: Thu Mar 23 16:12:06 2006
New Revision: 388303

URL: http://svn.apache.org/viewcvs?rev=388303&view=rev
Log:
Fixed more memory leaks

Modified:
    webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
    webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c

Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?rev=388303&r1=388302&r2=388303&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Thu Mar 23 16:12:06 2006
@@ -41,7 +41,7 @@
      */
     axis2_qname_t *qname;
     /**
-     * This will have a shallow copy and will not be freed by the descructor
+     * This will have a shallow copy, but will be freed by the descructor
      */
     axis2_transport_receiver_t *recv;
     /** to store handler in inFlow */
@@ -268,7 +268,11 @@
         transport_in_impl->faultphase = NULL;
     }
     
-    transport_in_impl->recv = NULL;
+    /*if (transport_in_impl->recv)
+    {
+        AXIS2_TRANSPORT_RECEIVER_FREE(transport_in_impl->recv, env);
+        transport_in_impl->recv = NULL;
+    }*/
       
     AXIS2_FREE((*env)->allocator, transport_in_impl);
     
@@ -375,6 +379,13 @@
     AXIS2_PARAM_CHECK((*env)->error, recv, AXIS2_FAILURE);
    
     transport_in_impl = AXIS2_INTF_TO_IMPL(transport_in);
+    
+    if (transport_in_impl->recv)
+    {
+        AXIS2_TRANSPORT_RECEIVER_FREE(transport_in_impl->recv, env);
+        transport_in_impl->recv = NULL;
+    }
+      
     transport_in_impl->recv = recv;
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?rev=388303&r1=388302&r2=388303&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Thu Mar 23 16:12:06 2006
@@ -44,7 +44,7 @@
     axis2_qname_t *qname;
     
     /**
-     * This will have a shallow copy and will not be freed by the descructor
+     * This will have a shallow copy, but will be freed by the descructor
      */
     axis2_transport_sender_t *sender;
     

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c?rev=388303&r1=388302&r2=388303&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c Thu Mar 23 16:12:06 2006
@@ -128,11 +128,13 @@
 		AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
 		server_impl->svr_thread = NULL;
 	}
+    
 	if(NULL != server_impl->conf_ctx)
 	{
 		AXIS2_CONF_CTX_FREE(server_impl->conf_ctx, env);
 		server_impl->conf_ctx = NULL;
 	}
+    
 	if(NULL != server->ops)
 	{
         AXIS2_FREE((*env)->allocator, server->ops);