mturk 2002/07/10 10:36:09
Modified: jk/native2/server/isapi jk_isapi_plugin.c
Log:
Fix the DllMain DLL_PROCESS_DETACH waitng for already closed thread.
Revision Changes Path
1.38 +4 -4
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_isapi_plugin.c 8 Jul 2002 07:45:32 -0000 1.37
+++ jk_isapi_plugin.c 10 Jul 2002 17:36:09 -0000 1.38
@@ -561,6 +561,7 @@
/* detatch the starter thread */
SetEvent(jk2_starter_event);
WaitForSingleObject(jk2_starter_thread, 3000);
+ CloseHandle(jk2_starter_thread);
return TRUE;
}
@@ -577,11 +578,10 @@
switch (ulReason) {
case DLL_PROCESS_DETACH:
- WaitForSingleObject(jk2_starter_thread, 1200000);
- CloseHandle(jk2_starter_thread);
/* Dirty hack to unload the jvm */
- if (was_inited && jk_jni_status_code)
+ if (was_inited && jk_jni_status_code) {
ExitProcess(0);
+ }
break;
case DLL_PROCESS_ATTACH:
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
