Author: toad
Date: 2008-07-30 19:21:33 +0000 (Wed, 30 Jul 2008)
New Revision: 21505
Modified:
trunk/freenet/.settings/org.eclipse.jdt.core.prefs
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
Complete the backport of r20573 - enable BucketChainBucket support.
Modified: trunk/freenet/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/freenet/.settings/org.eclipse.jdt.core.prefs 2008-07-30 19:09:10 UTC
(rev 21504)
+++ trunk/freenet/.settings/org.eclipse.jdt.core.prefs 2008-07-30 19:21:33 UTC
(rev 21505)
@@ -1,15 +1,15 @@
-#Sun Jul 09 17:12:16 CEST 2006
+#Thu Jul 17 14:26:28 BST 2008
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,REDFLAG
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2008-07-30 19:09:10 UTC (rev 21504)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2008-07-30 19:21:33 UTC (rev 21505)
@@ -21,6 +21,7 @@
import freenet.support.api.Bucket;
import freenet.support.compress.CompressionOutputSizeException;
import freenet.support.compress.Compressor;
+import freenet.support.io.BucketChainBucketFactory;
import freenet.support.io.BucketTools;
/**
@@ -170,7 +171,7 @@
ctx.eventProducer.produceEvent(new StartedCompressionEvent(i));
Compressor comp =
Compressor.getCompressionAlgorithmByDifficulty(i);
Bucket result;
- result = comp.compress(origData,
ctx.persistentBucketFactory, origData.size());
+ result = comp.compress(origData, new
BucketChainBucketFactory(ctx.persistentBucketFactory, CHKBlock.DATA_LENGTH),
origData.size());
if(result.size() <
oneBlockCompressedSize) {
bestCodec = comp;
if(bestCompressedData != null)
