mturk 2005/02/16 05:46:30
Modified: jk/native/common jk_lb_worker.c
Log:
If we can't get the endpoint try another worker by checking is_recoverable
only when we got the endpoint and endpoint service has been called.
Revision Changes Path
1.55 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- jk_lb_worker.c 16 Feb 2005 12:00:18 -0000 1.54
+++ jk_lb_worker.c 16 Feb 2005 13:46:30 -0000 1.55
@@ -483,7 +483,6 @@
if (e && e->endpoint_private && s && is_recoverable_error) {
lb_endpoint_t *p = e->endpoint_private;
- jk_endpoint_t *end = NULL;
int attempt = 0;
/* you can not recover on another load balancer */
@@ -506,6 +505,7 @@
if (rec) {
int is_recoverable = JK_FALSE;
+ jk_endpoint_t *end = NULL;
s->jvm_route = jk_pool_strdup(s->pool, rec->s->name);
@@ -542,7 +542,7 @@
rec->s->in_recovering = JK_FALSE;
rec->s->error_time = time(0);
- if (!is_recoverable) {
+ if (end && !is_recoverable) {
/*
* Error is not recoverable - break with an error.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
