Author: mturk
Date: Wed May 9 10:55:17 2012
New Revision: 1336076
URL: http://svn.apache.org/viewvc?rev=1336076&view=rev
Log:
make sure we force push if needed. Sequence will be set to a correct value
(incremented) inside push.
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_status.c
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1336076&r1=1336075&r2=1336076&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed May 9 10:55:17 2012
@@ -2704,7 +2704,7 @@ int ajp_validate(jk_worker_t *pThis,
p->name);
}
}
- p->s->addr_sequence = 1;
+ p->s->addr_sequence = 0;
p->s->last_maintain_time = time(NULL);
p->s->last_reset = p->s->last_maintain_time;
jk_ajp_push(p, JK_TRUE, l);
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1336076&r1=1336075&r2=1336076&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Wed May 9 10:55:17 2012
@@ -3188,7 +3188,7 @@ static void commit_worker(jk_ws_service_
}
}
if (sync_needed == JK_TRUE) {
- lb->sequence++;
+ lb->sequence = 0;
jk_lb_push(lb, JK_TRUE, l);
}
}
@@ -3647,7 +3647,7 @@ static void commit_all_members(jk_ws_ser
}
}
if (sync_needed == JK_TRUE) {
- wr->sequence++;
+ wr->sequence = 0;
if (!rc)
rc = 3;
}
@@ -3658,7 +3658,7 @@ static void commit_all_members(jk_ws_ser
/* Recalculate the load multiplicators wrt. lb_factor */
update_mult(lb, l);
if (rc) {
- lb->sequence++;
+ lb->sequence = 0;
jk_lb_push(lb, JK_TRUE, l);
}
}
@@ -4162,8 +4162,8 @@ static int update_worker(jk_ws_service_t
aw->addr_sequence++;
}
if (rv & (JK_STATUS_NEEDS_PUSH | JK_STATUS_NEEDS_ADDR_PUSH)) {
- wr->sequence++;
- lb->sequence++;
+ wr->sequence = 0;
+ lb->sequence = 0;
jk_lb_push(lb, JK_TRUE, l);
}
if (rv & JK_STATUS_NEEDS_RESET_LB_VALUES)
@@ -4212,7 +4212,7 @@ static int update_worker(jk_ws_service_t
aw->addr_sequence++;
}
if (rv & (JK_STATUS_NEEDS_PUSH | JK_STATUS_NEEDS_ADDR_PUSH)) {
- aw->sequence++;
+ aw->sequence = 0;
jk_ajp_push(aw, JK_TRUE, l);
}
if (rc == JK_FALSE) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
