Author: toad
Date: 2008-02-16 13:07:02 +0000 (Sat, 16 Feb 2008)
New Revision: 17988

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Do not remove from pendingKeys in removeFirst().
Should fix cooldown reregistering.

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-02-16 13:05:17 UTC (rev 17987)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-02-16 13:07:02 UTC (rev 17988)
@@ -472,9 +472,9 @@
                                                        
allRequestsByClientRequest.remove(cr);
                                                if(logMINOR) Logger.minor(this, 
"Removed from HashSet for "+cr+" which now has "+v.size()+" elements");
                                        }
-                                       if(!isInsertScheduler) {
-                                               removePendingKeys((SendableGet) 
req, true);
-                                       }
+                                       // Do not remove from the pendingKeys 
list.
+                                       // Whether it is running a request, 
waiting to execute, or waiting on the
+                                       // cooldown queue, ULPRs and backdoor 
coalescing should still be active.
                                }
                                if(logMINOR) Logger.minor(this, "removeFirst() 
returning "+req);
                                return req;


Reply via email to