Author: toad
Date: 2007-06-22 20:15:45 +0000 (Fri, 22 Jun 2007)
New Revision: 13714
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Prevent NPE
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2007-06-22 20:03:02 UTC (rev 13713)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2007-06-22 20:15:45 UTC (rev 13714)
@@ -444,7 +444,12 @@
int[] keyTokens = getter.allKeys();
for(int i=0;i<keyTokens.length;i++) {
int tok = keyTokens[i];
- Key key = getter.getKey(tok).getNodeKey();
+ ClientKey ckey = getter.getKey(tok);
+ if(ckey == null) {
+ Logger.error(this, "Key "+tok+" is null for
"+getter);
+ continue;
+ }
+ Key key = ckey.getNodeKey();
synchronized(pendingKeys) {
SendableGet[] gets = (SendableGet[])
pendingKeys.get(key);
if(gets == null) {
