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

[toad at freenetproject.org]

Author: toad
Date: 2008-02-05 00:41:27 +0000 (Tue, 05 Feb 2008)
New Revision: 17540

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

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java	2008-02-05 00:39:36 UTC (rev 17539)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java	2008-02-05 00:41:27 UTC (rev 17540)
@@ -379,14 +379,14 @@
 	public SendableRequest removeFirst() {
 		// Priorities start at 0
 		if(logMINOR) Logger.minor(this, "removeFirst()");
-		boolean tryOfferedKeys = node.random.nextBoolean();
+		boolean tryOfferedKeys = offeredKeys != null && node.random.nextBoolean();
 		int choosenPriorityClass = removeFirstAccordingToPriorities(tryOfferedKeys);
 		if(choosenPriorityClass == -1) {
 			if(logMINOR)
 				Logger.minor(this, "Nothing to do");
 			return null;
 		}
-		if((offeredKeys != null) && tryOfferedKeys) {
+		if(tryOfferedKeys) {
 			if(!offeredKeys[choosenPriorityClass].isEmpty())
 				return offeredKeys[choosenPriorityClass];
 		}