[freenet-cvs] r21826 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-08-13 23:29:52 +0000 (Wed, 13 Aug 2008)
New Revision: 21826

Modified:
   
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Fix NPE


Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-08-13 23:29:40 UTC (rev 21825)
+++ 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-08-13 23:29:52 UTC (rev 21826)
@@ -801,12 +801,13 @@
                                continue;
                        }
                        prevBlockNumber = blockNumber;
-                       ClientKey key = segment.getBlockKey(blockNumber, 
container).cloneKey();
+                       ClientKey key = segment.getBlockKey(blockNumber, 
container);
                        if(key == null) {
                                if(logMINOR)
                                        Logger.minor(this, "Block 
"+blockNumber+" is null, maybe race condition");
                                continue;
                        }
+                       key = key.cloneKey();
                        Key k = key.getNodeKey();
                        PersistentChosenBlock block = new 
PersistentChosenBlock(false, request, blockNumber, k, key, sched);
                        if(logMINOR) Logger.minor(this, "Created block 
"+block+" for block number "+blockNumber+" on "+this);