[freenet-dev] [freenet-cvs] r20868 - in trunk/freenet/src/freenet: client/async support/io

[NextGen$]

* bombe at freenetproject.org <bombe at freenetproject.org> [2008-06-29 17:03:08]:

> Author: bombe
> Date: 2008-06-29 17:03:08 +0000 (Sun, 29 Jun 2008)
> New Revision: 20868
> 
> Modified:
>    trunk/freenet/src/freenet/client/async/SingleFileInserter.java
>    trunk/freenet/src/freenet/support/io/BucketChainBucket.java
>    trunk/freenet/src/freenet/support/io/BucketChainBucketFactory.java
>    trunk/freenet/src/freenet/support/io/BucketTools.java
> Log:
> fix backport of BucketChainBucket
> 

As far as I can see you have restored the old behaviour bypassing the
non-working code... but that's hardly a fix :)

> Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
> ===================================================================
> --- trunk/freenet/src/freenet/client/async/SingleFileInserter.java	2008-06-29 16:23:27 UTC (rev 20867)
> +++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java	2008-06-29 17:03:08 UTC (rev 20868)
> @@ -14,7 +14,6 @@
>  import freenet.keys.BaseClientKey;
>  import freenet.keys.CHKBlock;
>  import freenet.keys.FreenetURI;
> - import freenet.keys.NodeCHK;
>  import freenet.keys.SSKBlock;
>  import freenet.support.Logger;
>  import freenet.support.OOMHandler;
> @@ -22,7 +21,6 @@
>  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;
>  
>  /**
> @@ -172,7 +170,7 @@
>  						ctx.eventProducer.produceEvent(new StartedCompressionEvent(i));
>  					Compressor comp = Compressor.getCompressionAlgorithmByDifficulty(i);
>  					Bucket result;
> -					result = comp.compress(origData, new BucketChainBucketFactory(ctx.persistentBucketFactory, NodeCHK.BLOCK_SIZE), origData.size());
> +					result = comp.compress(origData, ctx.persistentBucketFactory, origData.size());
>  					if(result.size() < oneBlockCompressedSize) {
>  						bestCodec = comp;
>  						if(bestCompressedData != null)
> 

That's the gist of the patch, right ? If so, where is the
BucketChainBucketFactory class used in the code ?

I have no problem with you disabling non-working code or even reverting my
backports... but please make it in separate commits with explicit commit
messages! This diff is huge for a 1 line workaround which isn't a "plain" revert.

Florent.