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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-04 13:43:45 +0000 (Fri, 04 Jul 2008)
New Revision: 20984

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Not much we can do with it if it's empty/cancelled

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-04 13:42:12 UTC (rev 20983)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-04 13:43:45 UTC (rev 20984)
@@ -246,6 +246,7 @@

        public ChosenRequest maybeMakeChosenRequest(SendableRequest req, 
ObjectContainer container, ClientContext context) {
                if(req == null) return null;
+               if(req.isEmpty(container) || req.isCancelled(container)) return 
null;
                Object token = req.chooseKey(this, req.persistent() ? container 
: null, context);
                if(token == null) {
                        return null;