You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2006/06/24 12:45:46 UTC
svn commit: r416898 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Author: mturk
Date: Sat Jun 24 03:45:45 2006
New Revision: 416898
URL: http://svn.apache.org/viewvc?rev=416898&view=rev
Log:
Fix 39834. The shmem cleanup might be called
after the log cleanup on graceful restart.
So don't use the log file.
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=416898&r1=416897&r2=416898&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 Sat Jun 24 03:45:45 2006
@@ -1752,12 +1752,8 @@
*/
static apr_status_t jk_cleanup_shmem(void *data)
{
- jk_logger_t *l = data;
jk_shm_close();
- if (l && JK_IS_DEBUG_LEVEL(l))
- jk_log(l, JK_LOG_DEBUG, "Shmem cleanup");
-
- return 0;
+ return APR_SUCCESS;
}
/** Main service method, called to forward a request to tomcat
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org