[freenet-cvs] r11829 - trunk/freenet/src/freenet/support

[t...@freenetproject.org]

Author: toad
Date: 2007-02-17 01:32:02 +0000 (Sat, 17 Feb 2007)
New Revision: 11829

Modified:
   trunk/freenet/src/freenet/support/SectoredRandomGrabArray.java
Log:
Remove if cancelled

Modified: trunk/freenet/src/freenet/support/SectoredRandomGrabArray.java
===================================================================
--- trunk/freenet/src/freenet/support/SectoredRandomGrabArray.java      
2007-02-17 01:24:30 UTC (rev 11828)
+++ trunk/freenet/src/freenet/support/SectoredRandomGrabArray.java      
2007-02-17 01:32:02 UTC (rev 11829)
@@ -68,7 +68,7 @@
                        RandomGrabArrayItem item = rga.removeRandom();
                        if(logMINOR)
                                Logger.minor(this, "RGA has picked "+item);
-                       if(rga.isEmpty() || (item == null)) {
+                       if(rga.isEmpty() || (item == null) || 
item.isCancelled()) {
                                if(logMINOR)
                                        Logger.minor(this, "Removing "+x);
                                Object client = rga.getClient();