Author: toad
Date: 2009-03-17 13:16:45 +0000 (Tue, 17 Mar 2009)
New Revision: 26057

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
Log:
Don't allocate non-persistent temp space out of the persistent temp file


Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java       
2009-03-17 07:17:32 UTC (rev 26056)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java       
2009-03-17 13:16:45 UTC (rev 26057)
@@ -101,7 +101,7 @@
                this.dataLength = data.size();
                Bucket[] dataBuckets;
                try {
-                       dataBuckets = BucketTools.split(data, 
CHKBlock.DATA_LENGTH, ctx.persistentBucketFactory, freeData, persistent, 
container);
+                       dataBuckets = BucketTools.split(data, 
CHKBlock.DATA_LENGTH, persistent ? ctx.persistentBucketFactory : 
context.tempBucketFactory, freeData, persistent, 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());

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

Reply via email to