Author: mturk Date: Wed Jun 11 23:07:00 2008 New Revision: 666966 URL: http://svn.apache.org/viewvc?rev=666966&view=rev Log: Exit watchdog thread on child cleanup
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?rev=666966&r1=666965&r2=666966&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Jun 11 23:07:00 2008 @@ -2179,6 +2179,8 @@ */ static apr_status_t jk_cleanup_shmem(void *data) { + /* Force the watchdog thread exit */ + jk_watchdog_interval = 0; jk_shm_close(); return APR_SUCCESS; } @@ -2788,9 +2790,10 @@ if (JK_IS_DEBUG_LEVEL(conf->log)) jk_log(conf->log, JK_LOG_DEBUG, "Watchdog running"); + if (!jk_watchdog_interval) + break; wc_maintain(conf->log); } - apr_thread_exit(thd, 0); return NULL; } @@ -2822,6 +2825,7 @@ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, "mod_jk: could not init JK watchdog thread"); } + apr_thread_detach(wdt); #endif } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]