[freenet-cvs] r21821 - in trunk/freenet/src/freenet: client/async node/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-08-13 17:43:17 +0000 (Wed, 13 Aug 2008)
New Revision: 21821

Modified:
   trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
Log:
Get rid of the remaining makeBucket(-1)

Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-08-13 17:31:32 UTC (rev 21820)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-08-13 17:43:17 UTC (rev 21821)
@@ -405,7 +405,7 @@
                                // FIXME support formats other than .zip.
                                // Only the *decoding* is generic at present.

-                               Bucket zipBucket = ctx.bf.makeBucket(-1);
+                               Bucket zipBucket = 
ctx.bf.makeBucket(baseMetadata.dataLength());
                                OutputStream os = new 
BufferedOutputStream(zipBucket.getOutputStream());
                                ZipOutputStream zos = new ZipOutputStream(os);
                                ZipEntry ze;

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-08-13 17:31:32 UTC (rev 21820)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-08-13 17:43:17 UTC (rev 21821)
@@ -227,7 +227,7 @@
                                        }
                                }
                        }
-                       decodedData = fetchContext.bucketFactory.makeBucket(-1);
+                       decodedData = 
fetchContext.bucketFactory.makeBucket(maxBlockLength * dataBuckets.length);
                        if(logMINOR) Logger.minor(this, "Copying data from data 
blocks");
                        OutputStream os = decodedData.getOutputStream();
                        for(int i=0;i<dataBuckets.length;i++) {

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java   2008-08-13 17:31:32 UTC 
(rev 21820)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java   2008-08-13 17:43:17 UTC 
(rev 21821)
@@ -105,9 +105,9 @@
                        tempFile = null;
                        try {
                                if(persistenceType == PERSIST_FOREVER)
-                                       ret = 
client.server.core.persistentTempBucketFactory.makeBucket(-1);
+                                       ret = 
client.server.core.persistentTempBucketFactory.makeBucket(maxOutputLength);
                                else
-                                       ret = fctx.bucketFactory.makeBucket(-1);
+                                       ret = 
fctx.bucketFactory.makeBucket(maxOutputLength);
                        } catch (IOException e) {
                                Logger.error(this, "Cannot create bucket for 
temp storage: "+e, e);
                                onFailure(new 
FetchException(FetchException.BUCKET_ERROR, e), null);
@@ -174,9 +174,9 @@
                        tempFile = null;
                        try {
                                if(persistenceType == PERSIST_FOREVER)
-                                       ret = 
client.server.core.persistentTempBucketFactory.makeBucket(-1);
+                                       ret = 
client.server.core.persistentTempBucketFactory.makeBucket(fctx.maxOutputLength);
                                else
-                                       ret = fctx.bucketFactory.makeBucket(-1);
+                                       ret = 
fctx.bucketFactory.makeBucket(fctx.maxOutputLength);
                        } catch (IOException e) {
                                Logger.error(this, "Cannot create bucket for 
temp storage: "+e, e);
                                onFailure(new 
FetchException(FetchException.BUCKET_ERROR, e), null);
@@ -269,9 +269,9 @@
                                try {
                                        // Create a new temp bucket
                                        if(persistenceType == PERSIST_FOREVER)
-                                               ret = 
client.server.core.persistentTempBucketFactory.makeBucket(-1);
+                                               ret = 
client.server.core.persistentTempBucketFactory.makeBucket(fctx.maxOutputLength);
                                        else
-                                               ret = 
fctx.bucketFactory.makeBucket(-1);
+                                               ret = 
fctx.bucketFactory.makeBucket(fctx.maxOutputLength);
                                } catch (IOException e1) {
                                        Logger.error(this, "Cannot create 
bucket for temp storage: "+e, e);
                                        onFailure(new 
FetchException(FetchException.BUCKET_ERROR, e), null);