r16459@catbus: nickm | 2007-11-06 13:26:11 -0500

 Fix "0 request for 0 router" message.

svn:r12399

diff --git a/ChangeLog b/ChangeLog
index 3124cdfacf6a7342a9004fc4b2fb2e576c8eeff0..0f5399fa264fa96d3867eb13d7450230c1457e3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,7 @@ Changes in version 0.2.0.10-alpha - 2007-11-0?
     - Refuse to start if both ORPort and UseBridges are set. Bugfix
       on 0.2.0.x.
     - Better log message on vote from unknown authority.
+    - Don't log "Launching 0 request for 0 router".
 
   o Minor bugfixes (memory leaks):
     - Stop leaking memory every time we parse a v3 certificate. Bugfix

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 3fa6353d5604d38709289f5e1241f0c636ce1868..f0cc674ca62c463f1f27cb039884a8e4fda86a78 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3527,7 +3527,7 @@ launch_router_descriptor_downloads(smartlist_t *downloadable, time_t now)
     }
   }
 
-  if (! should_delay) {
+  if (! should_delay && n_downloadable) {
     int i, n_per_request;
     const char *req_plural = "", *rtr_plural = "";
     n_per_request = (n_downloadable+MIN_REQUESTS-1) / MIN_REQUESTS;