Author: rjung
Date: Tue Feb 23 03:03:56 2010
New Revision: 915149

URL: http://svn.apache.org/viewvc?rev=915149&view=rev
Log:
Fix route logging in LB.

Modified:
    tomcat/jk/trunk/native/common/jk_lb_worker.c
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

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=915149&r1=915148&r2=915149&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Tue Feb 23 03:03:56 2010
@@ -840,7 +840,11 @@
             }
             else if (*wr.domain && !uses_domain) {
                 candidate = find_best_bydomain(s, p, wr.domain, states, l);
-                s->route = wr.domain;
+                if (candidate >= 0) {
+                    s->route = wr.domain;
+                } else {
+                    s->route = NULL;
+                }
             }
             if (candidate >= 0) {
                 wr = p->lb_workers[candidate];

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=915149&r1=915148&r2=915149&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Feb 23 03:03:56 2010
@@ -136,6 +136,9 @@
         Status: Remove duplicate "errors" line in property view of
         AJP13 workers that are part of a load balancer. (rjung)
       </fix>
+      <fix>
+        LB: Fix route logging. (rjung)
+      </fix>
       <update>
         Logging: Add optional log file locking for Windows when defining
         JK_LOG_LOCKING. (mturk)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to