[freenet-cvs] r7912 - in trunk/freenet/src/freenet: client keys node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-25 00:03:16 +0000 (Wed, 25 Jan 2006)
New Revision: 7912

Modified:
   trunk/freenet/src/freenet/client/FileInserter.java
   trunk/freenet/src/freenet/keys/Key.java
   trunk/freenet/src/freenet/node/Version.java
Log:
376: wrong fix :)

Modified: trunk/freenet/src/freenet/client/FileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/FileInserter.java  2006-01-25 00:00:28 UTC 
(rev 7911)
+++ trunk/freenet/src/freenet/client/FileInserter.java  2006-01-25 00:03:16 UTC 
(rev 7912)
@@ -140,7 +140,7 @@
                        }
                        ClientSSKBlock ssk;
                        try {
-                               ssk = isk.encode(data, metadata, true, codec, 
data.size(), ctx.random);
+                               ssk = isk.encode(data, metadata, false, codec, 
data.size(), ctx.random);
                        } catch (SSKEncodeException e) {
                                throw new 
InserterException(InserterException.INTERNAL_ERROR, e, isk.getURI());
                        } catch (IOException e) {
@@ -170,7 +170,7 @@
                                } else {
                                        if(origSize > 
ClientCHKBlock.MAX_LENGTH_BEFORE_COMPRESSION)
                                                throw new 
IllegalArgumentException("Data too big to compress into single block, but it 
does");
-                                       chk = ClientCHKBlock.encode(data, 
metadata, true, bestCodec.codecNumberForMetadata(), (int)origSize);
+                                       chk = ClientCHKBlock.encode(data, 
metadata, false, bestCodec.codecNumberForMetadata(), (int)origSize);
                                }
                        } catch (IOException e) {
                                throw new 
InserterException(InserterException.BUCKET_ERROR, e, null);

Modified: trunk/freenet/src/freenet/keys/Key.java
===================================================================
--- trunk/freenet/src/freenet/keys/Key.java     2006-01-25 00:00:28 UTC (rev 
7911)
+++ trunk/freenet/src/freenet/keys/Key.java     2006-01-25 00:03:16 UTC (rev 
7912)
@@ -136,9 +136,7 @@
         // because compressing it improves its entropy.
         if(sourceData.size() > MAX_LENGTH_BEFORE_COMPRESSION)
             throw new KeyEncodeException("Too big");
-        if(alreadyCompressedCodec != -1) {
-               compressionAlgorithm = alreadyCompressedCodec;
-        } else if(!dontCompress) {
+        if(!dontCompress) {
                byte[] cbuf = null;
                if(alreadyCompressedCodec >= 0) {
                        if(sourceData.size() > MAX_COMPRESSED_DATA_LENGTH)

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-25 00:00:28 UTC (rev 
7911)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-25 00:03:16 UTC (rev 
7912)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 375;
+       public static final int buildNumber = 376;

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 374;