[freenet-cvs] r20915 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-07-01 16:03:12 +0000 (Tue, 01 Jul 2008)
New Revision: 20915

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Check cancelled || empty here

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-01 16:01:57 UTC (rev 20914)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-01 16:03:12 UTC (rev 20915)
@@ -407,7 +407,7 @@
                        }
                        if(altReq != null)
                                container.activate(altReq, 1);
-                       if(altReq != null && altReq.isCancelled(container)) {
+                       if(altReq != null && (altReq.isCancelled(container) || 
altReq.isEmpty(container))) {
                                if(logMINOR)
                                        Logger.minor(this, "Ignoring cancelled 
recently succeeded item "+altReq);
                                altReq = null;