tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r701441 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
Date Fri, 03 Oct 2008 16:45:50 GMT
Author: rjung
Date: Fri Oct  3 09:45:49 2008
New Revision: 701441

URL: http://svn.apache.org/viewvc?rev=701441&view=rev
Log:
In order to fallback to traditional maintenance with IIS,
we must also reset watchdog_interval. But then it is
natural to use watchdog_interval and not is_inited as
a thread stop trigger for IIS, as we do for Apache.

Modified:
    tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=701441&r1=701440&r2=701441&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Fri Oct  3 09:45:49 2008
@@ -2199,6 +2199,7 @@
 
     if (is_inited) {
         is_inited = JK_FALSE;
+        watchdog_interval = 0;
         if (watchdog_handle) {
             WaitForSingleObject(watchdog_handle, INFINITE);
             CloseHandle(watchdog_handle);
@@ -2294,13 +2295,13 @@
                "Watchdog thread initialized with %u second interval",
                watchdog_interval);
     }
-    while (is_inited) {
+    while (watchdog_interval) {
         for (i = 0; i < (watchdog_interval * 10); i++) {
-            if (!is_inited)
+            if (!watchdog_interval)
                 break;
             Sleep(100);
         }
-        if (!is_inited)
+        if (!watchdog_interval)
             break;
         if (JK_IS_DEBUG_LEVEL(logger)) {
             jk_log(logger, JK_LOG_DEBUG,
@@ -2486,6 +2487,7 @@
             if (!watchdog_handle) {
                 jk_log(logger, JK_LOG_EMERG, "Error %d (0x%08x) creating Watchdog thread",
                        GetLastError(), GetLastError());
+                watchdog_interval = 0;
             }
         }
         jk_log(logger, JK_LOG_INFO, "%s initialized", (VERSION_STRING));



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


Mime
View raw message