Author: toad
Date: 2009-01-16 22:09:35 +0000 (Fri, 16 Jan 2009)
New Revision: 25097

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Count the last data block for decode if the last data block is full, even if 
ignoreLastDataBlock is set. On splitfiles inserted by 1195 or later, it will be.


Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2009-01-16 22:03:33 UTC (rev 25096)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2009-01-16 22:09:35 UTC (rev 25097)
@@ -204,7 +204,7 @@
                                return;
                        } else {
                                // Don't count the last data block, since we 
can't use it in FEC decoding.
-                               if(!(ignoreLastDataBlock && blockNo == 
dataKeys.length - 1))
+                               if(!(ignoreLastDataBlock && blockNo == 
dataKeys.length - 1 && data.size() != CHKBlock.DATA_LENGTH))
                                        fetchedBlocks++;
                                else
                                        // This block is not going to be 
fetched, and because of the insertion format. 

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to