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/03/16 09:58:19 UTC
svn commit: r386291 -
/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Author: mturk
Date: Thu Mar 16 00:58:17 2006
New Revision: 386291
URL: http://svn.apache.org/viewcvs?rev=386291&view=rev
Log:
Before decrementing busy flag, check if it was already
reset by graceful shutdown, to disable the negative
busy count values.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=386291&r1=386290&r2=386291&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Thu Mar 16 00:58:17 2006
@@ -721,9 +721,14 @@
* We have at least one endpoint free
*/
rec->s->is_busy = JK_FALSE;
- /* Decrement the busy worker count */
- rec->s->busy--;
- p->worker->s->busy--;
+ /* Decrement the busy worker count.
+ * Check if the busy was reset to zero by graceful
+ * restart of the server.
+ */
+ if (rec->s->busy)
+ rec->s->busy--;
+ if (p->worker->s->busy)
+ p->worker->s->busy--;
if (service_stat == JK_TRUE) {
rec->s->in_error_state = JK_FALSE;
rec->s->in_recovering = JK_FALSE;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org