You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2006/09/16 20:32:04 UTC
svn commit: r446913 -
/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Author: rjung
Date: Sat Sep 16 11:32:04 2006
New Revision: 446913
URL: http://svn.apache.org/viewvc?view=rev&rev=446913
Log:
Exclude disabled worker from the single worker shurtcut in lb.
Even for the single worker case, disabled should behave as documented, i.e.
not accept requests without correct jvm_route.
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=446913&r1=446912&r2=446913
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sat Sep 16 11:32:04 2006
@@ -601,9 +601,11 @@
* if there is a single one
*/
if (JK_WORKER_USABLE_STICKY(p->lb_workers[0].s)) {
- p->lb_workers[0].r = &(p->lb_workers[0].s->jvm_route[0]);
- JK_TRACE_EXIT(l);
- return &p->lb_workers[0];
+ if (p->lb_workers[0].s->activation != JK_LB_ACTIVATION_DISABLED) {
+ p->lb_workers[0].r = &(p->lb_workers[0].s->jvm_route[0]);
+ JK_TRACE_EXIT(l);
+ return &p->lb_workers[0];
+ }
}
else {
JK_TRACE_EXIT(l);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org