[freenet-cvs] r11662 - in trunk/freenet/src/freenet: keys support/io

[t...@freenetproject.org]

Author: toad
Date: 2007-02-03 16:31:58 +0000 (Sat, 03 Feb 2007)
New Revision: 11662

Modified:
   trunk/freenet/src/freenet/keys/ClientSSKBlock.java
   trunk/freenet/src/freenet/keys/Key.java
   trunk/freenet/src/freenet/support/io/BucketTools.java
Log:
Doh. Need to pass length to makeImmutableBucket.

Modified: trunk/freenet/src/freenet/keys/ClientSSKBlock.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientSSKBlock.java  2007-02-03 16:28:23 UTC 
(rev 11661)
+++ trunk/freenet/src/freenet/keys/ClientSSKBlock.java  2007-02-03 16:31:58 UTC 
(rev 11662)
@@ -83,7 +83,7 @@
         decoded = true;

         if(dontDecompress) {
-               return BucketTools.makeImmutableBucket(factory, dataOutput);
+               return BucketTools.makeImmutableBucket(factory, dataOutput, 
dataLength);
         }

         Bucket b = Key.decompress(compressionAlgorithm >= 0, dataOutput, 
dataLength, factory, Math.min(MAX_DECOMPRESSED_DATA_LENGTH, maxLength), 
compressionAlgorithm, true);

Modified: trunk/freenet/src/freenet/keys/Key.java
===================================================================
--- trunk/freenet/src/freenet/keys/Key.java     2007-02-03 16:28:23 UTC (rev 
11661)
+++ trunk/freenet/src/freenet/keys/Key.java     2007-02-03 16:31:58 UTC (rev 
11662)
@@ -124,7 +124,7 @@
                                throw new CHKDecodeException("Too big");
                        }
         } else {
-               return BucketTools.makeImmutableBucket(bf, output);
+               return BucketTools.makeImmutableBucket(bf, output, 
outputLength);
         }
        }


Modified: trunk/freenet/src/freenet/support/io/BucketTools.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketTools.java       2007-02-03 
16:28:23 UTC (rev 11661)
+++ trunk/freenet/src/freenet/support/io/BucketTools.java       2007-02-03 
16:31:58 UTC (rev 11662)
@@ -254,9 +254,13 @@
        }

        public static Bucket makeImmutableBucket(BucketFactory bucketFactory, 
byte[] data) throws IOException {
-               Bucket bucket = bucketFactory.makeBucket(data.length);
+               return makeImmutableBucket(bucketFactory, data, data.length);
+       }
+       
+       public static Bucket makeImmutableBucket(BucketFactory bucketFactory, 
byte[] data, int length) throws IOException {
+               Bucket bucket = bucketFactory.makeBucket(length);
                OutputStream os = bucket.getOutputStream();
-               os.write(data);
+               os.write(data, 0, length);
                os.close();
                bucket.setReadOnly();
                return bucket;