Author: toad
Date: 2008-05-30 18:14:15 +0000 (Fri, 30 May 2008)
New Revision: 20146
Modified:
branches/db4o/freenet/src/freenet/node/RequestStarter.java
Log:
Remove if cancelled.
Modified: branches/db4o/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestStarter.java 2008-05-30
18:12:19 UTC (rev 20145)
+++ branches/db4o/freenet/src/freenet/node/RequestStarter.java 2008-05-30
18:14:15 UTC (rev 20146)
@@ -181,8 +181,12 @@
private SendableRequest getRequest() {
SendableRequest req;
- synchronized(queue) {
- req = (SendableRequest) queue.removeFirst();
+ while(true) {
+ synchronized(queue) {
+ req = (SendableRequest) queue.removeFirst();
+ }
+ if(req.isCancelled()) continue;
+ break;
}
SendableRequest betterReq =
sched.getBetterNonPersistentRequest(req);
if(req != null) {
