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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-24 23:14:27 +0000 (Mon, 24 Mar 2008)
New Revision: 18752

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Detect key == null here too.

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2008-03-24 22:56:40 UTC (rev 18751)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2008-03-24 23:14:27 UTC (rev 18752)
@@ -146,6 +146,13 @@
                        }
                        // LOCKING: keys is safe to check, but segment isn't.
                        Key key = 
segment.getBlockNodeKey(((Integer)ret).intValue());
+                       if(key == null) {
+                               Logger.error(this, "Key is null for block 
"+ret+" for "+this+" in hasValidKeys()");
+                               synchronized(this) {
+                                       blockNums.remove(x);
+                               }
+                               continue;
+                       }
                        if(keys.hasKey(key)) {
                                synchronized(this) {
                                        blockNums.add(ret);