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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-25 20:32:39 +0000 (Mon, 25 Jun 2007)
New Revision: 13753

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Fix NPE in client level block request coalescing

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2007-06-25 20:10:28 UTC (rev 13752)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2007-06-25 20:32:39 UTC (rev 13753)
@@ -274,6 +274,7 @@
                        for(int i=0;i<blockNums.size();i++) {
                                int num = 
((Integer)blockNums.get(i)).intValue();
                                ckey = segment.getBlockKey(num);
+                               if(ckey == null) return; // Already got this key
                                Key k = ckey.getNodeKey();
                                if(k.equals(key)) {
                                        blockNum = num;