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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-18 18:51:00 +0000 (Wed, 18 Jun 2008)
New Revision: 20449

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Doh, fix NPE

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-06-18 18:49:27 UTC (rev 20448)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-06-18 18:51:00 UTC (rev 20449)
@@ -176,6 +176,7 @@
        // The worry is ... is there any nested locking outside of the 
hierarchy?
        ChosenRequest removeFirst(int fuzz, RandomSource random, 
OfferedKeysList[] offeredKeys, RequestStarter starter, 
ClientRequestSchedulerNonPersistent schedTransient, boolean transientOnly, 
short maxPrio, int retryCount, ClientContext context) {
                SendableRequest req = removeFirstInner(fuzz, random, 
offeredKeys, starter, schedTransient, transientOnly, maxPrio, retryCount, 
context);
+               if(req == null) return null;
                Object token = req.chooseKey(this, req.persistent() ? container 
: null, context);
                if(token == null) {
                        return null;