Author: mturk
Date: Fri May 4 18:56:54 2012
New Revision: 1334119
URL: http://svn.apache.org/viewvc?rev=1334119&view=rev
Log:
Fix dead-lock caused by not releasing mutex on close
Modified:
tomcat/jk/trunk/native/common/jk_shm.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1334119&r1=1334118&r2=1334119&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Fri May 4 18:56:54 2012
@@ -359,6 +359,7 @@ void jk_shm_close(jk_logger_t *l)
#if defined (WIN32)
if (jk_shm_hlock) {
WaitForSingleObject(jk_shm_hlock, 60000);
+ ReleaseMutex(jk_shm_hlock);
CloseHandle(jk_shm_hlock);
jk_shm_hlock = NULL;
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1334119&r1=1334118&r2=1334119&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Fri May 4 18:56:54 2012
@@ -45,6 +45,9 @@
<subsection name="Native">
<changelog>
<fix>
+ Fix dead-lock caused by not releasing mutex on close. (mturk)
+ </fix>
+ <fix>
Fix compilation of mod_jk for HTTPD 1.3. (rjung)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
