Author: mturk
Date: Fri Jul 7 23:51:13 2006
New Revision: 420062
URL: http://svn.apache.org/viewvc?rev=420062&view=rev
Log:
Remove duplicate lockings for the status worker.
Fixes the problem reported for 1.2.16 on Tomcat users list.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=420062&r1=420061&r2=420062&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Fri Jul 7 23:51:13
2006
@@ -755,13 +755,9 @@
i = status_bool("wd", s->query_string);
j = status_bool("ws", s->query_string);
if (wr->s->is_disabled!=i || wr->s->is_stopped!=j) {
- /* lock shared memory */
- jk_shm_lock();
wr->s->is_disabled = i;
wr->s->is_stopped = j;
reset_lb_values(lb, l);
- /* unlock the shared memory */
- jk_shm_unlock();
if (i+j==0) {
jk_log(l, JK_LOG_INFO,
"worker %s restarted in status worker"
@@ -771,12 +767,8 @@
}
i = status_int("wx", s->query_string, wr->s->distance);
if (wr->s->distance!=i) {
- /* lock shared memory */
- jk_shm_lock();
wr->s->distance = i;
reset_lb_values(lb, l);
- /* unlock the shared memory */
- jk_shm_unlock();
}
i = status_int("wf", s->query_string, wr->s->lb_factor);
if (i > 0 && wr->s->lb_factor != i) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
