Author: rjung
Date: Wed Sep 13 11:01:25 2006
New Revision: 443045
URL: http://svn.apache.org/viewvc?view=rev&rev=443045
Log:
Either we use "attempt == 1", or we drop it completely.
"attempt" now start counting at 1, "attempt == 0" will happen never,
so the clause will always evaluate to false.
We can drop the condition on "attempt" and only use the was_forced:
We don't care, how many attempts with get_most_suitable() it took
until all of the child workers went into ERROR,
as long as we do forced recovery only once per request.
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/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diff&rev=443045&r1=443044&r2=443045
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Wed Sep 13 11:01:25
2006
@@ -958,7 +958,7 @@
}
else {
/* NULL record, no more workers left ... */
- if (attempt == 0 && !was_forced) {
+ if (!was_forced) {
int nf;
/* Force recovery only on first attempt.
* If the second fails, Tomcat is still disconnected.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
