Author: mturk
Date: Tue Aug 29 00:37:23 2006
New Revision: 437994
URL: http://svn.apache.org/viewvc?rev=437994&view=rev
Log:
Fix return values from jk_get_worker_activation.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_util.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?rev=437994&r1=437993&r2=437994&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Tue Aug 29 00:37:23
2006
@@ -1003,7 +1003,13 @@
p->lb_workers[i].s->lb_value = 0;
p->lb_workers[i].s->state = JK_LB_STATE_NA;
p->lb_workers[i].s->error_time = 0;
- p->lb_workers[i].s->activation =
jk_get_worker_activation(props, worker_names[i]);
+ if ((p->lb_workers[i].s->activation =
+ jk_get_worker_activation(props, worker_names[i])) < 0) {
+ jk_log(l, JK_LOG_ERROR,
+ "Invalid Activation mode for worker %s",
+ worker_names[i]);
+ break;
+ }
if (!wc_create_worker(p->lb_workers[i].s->name, 0,
props,
&(p->lb_workers[i].w),
Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=437994&r1=437993&r2=437994&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Tue Aug 29 00:37:23 2006
@@ -781,6 +781,8 @@
return JK_LB_ACTIVATION_STOPPED;
else if (*v == 'd' || *v == 'D')
return JK_LB_ACTIVATION_DISABLED;
+ else
+ return -1;
}
else if (jk_get_is_worker_stopped(m, wname))
return JK_LB_ACTIVATION_STOPPED;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
