[freenet-cvs] r17585 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-02-06 01:17:48 +0000 (Wed, 06 Feb 2008)
New Revision: 17585

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Doh... NPE

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-02-06 01:15:23 UTC (rev 17584)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-02-06 01:17:48 UTC (rev 17585)
@@ -382,7 +382,7 @@
                if(logMINOR) Logger.minor(this, "removeFirst()");
                boolean tryOfferedKeys = offeredKeys != null && 
node.random.nextBoolean();
                int choosenPriorityClass = 
removeFirstAccordingToPriorities(tryOfferedKeys);
-               if(choosenPriorityClass == -1 && !tryOfferedKeys) {
+               if(choosenPriorityClass == -1 && offeredKeys != null && 
!tryOfferedKeys) {
                        tryOfferedKeys = true;
                        choosenPriorityClass = 
removeFirstAccordingToPriorities(tryOfferedKeys);
                }