tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject svn commit: r532254 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Date Wed, 25 Apr 2007 08:34:48 GMT
Author: hgomez
Date: Wed Apr 25 01:34:47 2007
New Revision: 532254

URL: http://svn.apache.org/viewvc?view=rev&rev=532254
Log:
Cleanup the pointer content (handle)

Modified:
    tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=532254&r1=532253&r2=532254
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Apr 25 01:34:47 2007
@@ -2544,15 +2544,11 @@
 
 static apr_status_t jklog_cleanup(void *d)
 {
-    /* On i5/OS, Apache 2.x init stages and exec mode are done in the same thread */
-    /* No fork as on Unixes, we need to cleanup some static variables */
-#ifdef AS400
-    main_log = NULL;
-#endif
-
     /* hgomez@20070425 */
-    /* If we pass a pointer (ie: main_log), shouldn't it be *d = NULL ? */
-    d = NULL;
+    /* Clean up pointer content */
+    if (d != NULL)
+        *(jk_logger_t **)d = NULL;
+
     return APR_SUCCESS;
 }
 
@@ -2630,7 +2626,7 @@
             /* hgomez@20070425 */
             /* Shouldn't we clean both conf->log and main_log ?                   */
             /* Also should we pass pointer (ie: main_log) or handle (*main_log) ? */
-            apr_pool_cleanup_register(p, main_log, jklog_cleanup, jklog_cleanup);
+            apr_pool_cleanup_register(p, &main_log, jklog_cleanup, jklog_cleanup);
         }
 
         return 0;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message