[freenet-cvs] r10755 - trunk/freenet/src/freenet/keys

[t...@freenetproject.org]

Author: toad
Date: 2006-10-31 16:55:36 +0000 (Tue, 31 Oct 2006)
New Revision: 10755

Modified:
   trunk/freenet/src/freenet/keys/Key.java
Log:
Fix compression size bug.

Modified: trunk/freenet/src/freenet/keys/Key.java
===================================================================
--- trunk/freenet/src/freenet/keys/Key.java     2006-10-31 14:44:44 UTC (rev 
10754)
+++ trunk/freenet/src/freenet/keys/Key.java     2006-10-31 16:55:36 UTC (rev 
10755)
@@ -136,8 +136,6 @@
     static Compressed compress(Bucket sourceData, boolean dontCompress, short 
alreadyCompressedCodec, long sourceLength, long MAX_LENGTH_BEFORE_COMPRESSION, 
long MAX_COMPRESSED_DATA_LENGTH, boolean shortLength) throws 
KeyEncodeException, IOException {
        byte[] finalData = null;
         short compressionAlgorithm = -1;
-        // Try to compress it - even if it fits into the block,
-        // because compressing it improves its entropy.
         if(sourceData.size() > MAX_LENGTH_BEFORE_COMPRESSION)
             throw new KeyEncodeException("Too big");
         if((!dontCompress) || (alreadyCompressedCodec >= 0)) {
@@ -150,7 +148,7 @@
                        if(sourceLength > MAX_LENGTH_BEFORE_COMPRESSION)
                                throw new CHKEncodeException("Too big");
                } else {
-                       if (sourceData.size() > NodeCHK.BLOCK_SIZE) {
+                       if (sourceData.size() > MAX_COMPRESSED_DATA_LENGTH) {
                                        // Determine the best algorithm
                                        for (int i = 0; i < 
Compressor.countCompressAlgorithms(); i++) {
                                                Compressor comp = Compressor
@@ -158,7 +156,7 @@
                                                ArrayBucket compressedData;
                                                try {
                                                        compressedData = 
(ArrayBucket) comp.compress(
-                                                                       
sourceData, new ArrayBucketFactory(), NodeCHK.BLOCK_SIZE);
+                                                                       
sourceData, new ArrayBucketFactory(), MAX_COMPRESSED_DATA_LENGTH);
                                                } catch (IOException e) {
                                                        throw new Error(e);
                                                } catch 
(CompressionOutputSizeException e) {
@@ -197,7 +195,7 @@
                }
         }
         if(finalData == null) {
-            if(sourceData.size() > NodeCHK.BLOCK_SIZE) {
+            if(sourceData.size() > MAX_COMPRESSED_DATA_LENGTH) {
                 throw new CHKEncodeException("Too big");
             }
                finalData = BucketTools.toByteArray(sourceData);