You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/03/21 07:59:49 UTC

svn commit: r387443 - in /webservices/axis2/trunk/c: include/axis2_thread_pool.h modules/util/env.c modules/util/thread_pool.c

Author: samisa
Date: Mon Mar 20 22:59:46 2006
New Revision: 387443

URL: http://svn.apache.org/viewcvs?rev=387443&view=rev
Log:
Fixed thread pool free mechanism

Modified:
    webservices/axis2/trunk/c/include/axis2_thread_pool.h
    webservices/axis2/trunk/c/modules/util/env.c
    webservices/axis2/trunk/c/modules/util/thread_pool.c

Modified: webservices/axis2/trunk/c/include/axis2_thread_pool.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_thread_pool.h?rev=387443&r1=387442&r2=387443&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_thread_pool.h (original)
+++ webservices/axis2/trunk/c/include/axis2_thread_pool.h Mon Mar 20 22:59:46 2006
@@ -119,7 +119,7 @@
 		((thread_pool)->ops->thread_detach(thread_pool, thd))
 
 #define AXIS2_THREAD_POOL_FREE(thread_pool) \
-		((thread_pool)->free(thread_pool))
+		((thread_pool)->ops->free(thread_pool))
 
 /** @} */
     

Modified: webservices/axis2/trunk/c/modules/util/env.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/env.c?rev=387443&r1=387442&r2=387443&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/env.c (original)
+++ webservices/axis2/trunk/c/modules/util/env.c Mon Mar 20 22:59:46 2006
@@ -27,7 +27,10 @@
 	
 	if(NULL != env && NULL != env->error)
         AXIS2_ERROR_FREE(env->error);
-    
+
+    if(NULL != env && NULL != env->thread_pool)
+        AXIS2_THREAD_POOL_FREE(env->thread_pool);
+
     if(NULL != env)
         free (env);
 	

Modified: webservices/axis2/trunk/c/modules/util/thread_pool.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/thread_pool.c?rev=387443&r1=387442&r2=387443&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/thread_pool.c (original)
+++ webservices/axis2/trunk/c/modules/util/thread_pool.c Mon Mar 20 22:59:46 2006
@@ -84,7 +84,7 @@
 axis2_status_t AXIS2_CALL
 axis2_thread_pool_free (axis2_thread_pool_t *pool)
 {
-    axis2_thread_pool_impl_t *pool_impl = NULL;
+    axis2_thread_pool_impl_t *pool_impl = AXIS2_INTF_TO_IMPL(pool);
 	if(NULL == pool)
 	{
 		return AXIS2_FAILURE;