Hi Mladen,
On 19.03.2012 15:40, mt...@apache.org wrote:
Author: mturk
Date: Mon Mar 19 14:40:15 2012
New Revision: 1302479
URL: http://svn.apache.org/viewvc?rev=1302479&view=rev
Log:
Make sure we pull only if the sequence is above us
Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1302479&r1=1302478&r2=1302479&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Mon Mar 19 14:40:15 2012
...
@@ -365,13 +365,12 @@ void jk_lb_push(lb_worker_t *p, int lock
p->s->lbmethod = p->lbmethod;
p->s->lblock = p->lblock;
p->s->max_packet_size = p->max_packet_size;
- p->s->h.sequence = p->sequence;
strncpy(p->s->session_cookie, p->session_cookie, JK_SHM_STR_SIZ);
strncpy(p->s->session_path, p->session_path, JK_SHM_STR_SIZ);
for (i = 0; i< p->num_of_workers; i++) {
lb_sub_worker_t *w =&p->lb_workers[i];
- if (w->sequence != w->s->h.sequence) {
+ if (w->sequence< w->s->h.sequence) {
I think this one is wrong. It is inside push not pull, so it should be
if (local > shared) and not "<".
jk_worker_t *jw = w->worker;
ajp_worker_t *aw = (ajp_worker_t *)jw->worker_private;
The other changes in this commit look right.
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
