Author: toad
Date: 2008-10-02 22:20:17 +0000 (Thu, 02 Oct 2008)
New Revision: 22922
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
One last canRemove() call.
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-10-02 22:15:15 UTC (rev 22921)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-10-02 22:20:17 UTC (rev 22922)
@@ -487,16 +487,6 @@
// Now we have chosen a request.
if(logMINOR) Logger.minor(this, "removeFirst()
returning "+req+" ("+chosenTracker.getNumber()+", prio "+
req.getPriorityClass(container)+",
retries "+req.getRetryCount()+", client "+req.getClient()+", client-req
"+req.getClientRequest()+ ')');
- ClientRequester cr = req.getClientRequest();
- if(req.canRemove(container)) {
- if(req.persistent())
-
removeFromAllRequestsByClientRequest(req, cr, false, container);
- else
-
schedTransient.removeFromAllRequestsByClientRequest(req, cr, false, null);
- // 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+" of "+req.getClientRequest());
return req;
