mturk 2004/12/17 00:33:43 Modified: jk/native/common jk_lb_worker.c Log: Search for domain types 3 and 4 only if the worker has local workers defined. They'll return null worker if not defined in any case. Revision Changes Path 1.38 +22 -18 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c Index: jk_lb_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- jk_lb_worker.c 16 Dec 2004 15:07:55 -0000 1.37 +++ jk_lb_worker.c 17 Dec 2004 08:33:43 -0000 1.38 @@ -392,7 +392,8 @@ "found domain %s in route %s\n", session_domain, session_route); - rc = get_suitable_worker(p, 2, session_domain, 0, p->num_of_workers, 1, &domain_id, l); + rc = get_suitable_worker(p, 2, session_domain, 0, p->num_of_workers, + 1, &domain_id, l); if (rc) { JK_TRACE_EXIT(l); return rc; @@ -403,25 +404,28 @@ } + if (p->num_of_local_workers) { + rc = get_suitable_worker(p, 3, "any", 0, p->num_of_local_workers, + 1, &domain_id, l); + if (rc) { + JK_TRACE_EXIT(l); + return rc; + } - rc = get_suitable_worker(p, 3, "any", 0, p->num_of_local_workers, 1, &domain_id, l); - if (rc) { - JK_TRACE_EXIT(l); - return rc; - } - - if (p->local_worker_only) { - JK_TRACE_EXIT(l); - return NULL; - } + if (p->local_worker_only) { + JK_TRACE_EXIT(l); + return NULL; + } - rc = get_suitable_worker(p, 4, "any", p->num_of_local_workers, p->num_of_workers, 1, &domain_id, l); - if (rc) { - JK_TRACE_EXIT(l); - return rc; + rc = get_suitable_worker(p, 4, "any", p->num_of_local_workers, + p->num_of_workers, 1, &domain_id, l); + if (rc) { + JK_TRACE_EXIT(l); + return rc; + } } - - rc = get_suitable_worker(p, 5, "any", p->num_of_local_workers, p->num_of_workers, 1, &domain_id, l); + rc = get_suitable_worker(p, 5, "any", p->num_of_local_workers, p->num_of_workers, + 1, &domain_id, l); JK_TRACE_EXIT(l); return rc; }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]