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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-18 23:45:14 +0000 (Mon, 18 Feb 2008)
New Revision: 18060

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Simplify slightly

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2008-02-18 23:44:25 UTC (rev 18059)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2008-02-18 23:45:14 UTC (rev 18060)
@@ -311,10 +311,8 @@
                        for(int i=0;i<blockNums.size();i++) {
                                token = blockNums.get(i);
                                int num = ((Integer)token).intValue();
-                               ckey = segment.getBlockKey(num);
-                               if(ckey == null) continue; // Already got this 
key
-                               Key k = ckey.getNodeKey();
-                               if(k.equals(key)) {
+                               Key k = segment.getBlockNodeKey(num);
+                               if(k != null && k.equals(key)) {
                                        blockNum = num;
                                        blockNums.remove(i);
                                        break;