Author: toad
Date: 2009-01-09 23:18:22 +0000 (Fri, 09 Jan 2009)
New Revision: 24996

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
Log:
Pad the last block even if we don't freeData!


Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java       
2009-01-09 20:31:18 UTC (rev 24995)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java       
2009-01-09 23:18:22 UTC (rev 24996)
@@ -104,6 +104,7 @@
                        if(freeData) {
                                // BucketTools.split will free it but not 
removeFrom().
                                data.removeFrom(container);
+                       }
                                if(dataBuckets[dataBuckets.length-1].size() < 
CHKBlock.DATA_LENGTH) {
                                        Bucket oldData = 
dataBuckets[dataBuckets.length-1];
                                        dataBuckets[dataBuckets.length-1] = 
BucketTools.pad(oldData, CHKBlock.DATA_LENGTH, context.persistentBucketFactory, 
(int) oldData.size());
@@ -111,7 +112,6 @@
                                        oldData.free();
                                        if(persistent) 
oldData.removeFrom(container);
                                }
-                       }
                        if(logMINOR)
                                Logger.minor(this, "Data size "+data.size()+" 
buckets "+dataBuckets.length);
                } catch (IOException e) {

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

Reply via email to