[freenet-cvs] r20823 - branches/db4o/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-06-27 17:16:56 +0000 (Fri, 27 Jun 2008)
New Revision: 20823

Modified:
   branches/db4o/freenet/src/freenet/node/RequestStarter.java
Log:
If we drop a request we *must* removeFetchingKey

Modified: branches/db4o/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestStarter.java  2008-06-27 
16:57:48 UTC (rev 20822)
+++ branches/db4o/freenet/src/freenet/node/RequestStarter.java  2008-06-27 
17:16:56 UTC (rev 20823)
@@ -224,7 +224,10 @@
        }

        private boolean startRequest(ChosenRequest req, boolean logMINOR) {
-               if((!req.isPersistent()) && req.request.isCancelled(null)) 
return false;
+               if((!req.isPersistent()) && req.request.isCancelled(null)) {
+                       sched.removeFetchingKey(req.key);
+                       return false;
+               }
                if(logMINOR) Logger.minor(this, "Running request "+req+" 
priority "+req.prio);
                core.getExecutor().execute(new SenderThread(req, req.key), 
"RequestStarter$SenderThread for "+req);
                return true;