Author: toad
Date: 2008-11-27 02:45:55 +0000 (Thu, 27 Nov 2008)
New Revision: 23906
Modified:
trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
More bucket leak fixes.
Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-11-27 02:26:54 UTC (rev 23905)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-11-27 02:45:55 UTC (rev 23906)
@@ -43,7 +43,7 @@
InsertBlock block =
new InsertBlock(data, cm,
FreenetURI.EMPTY_CHK_URI);
this.origSFI =
- new SingleFileInserter(this, this, block,
false, ctx, false, getCHKOnly, true, null, null, false, null, earlyEncode);
+ new SingleFileInserter(this, this, block,
false, ctx, false, getCHKOnly, true, null, null, true, null, earlyEncode);
metadata = null;
}
@@ -445,6 +445,7 @@
String mimeType = (archiveType ==
ARCHIVE_TYPE.TAR ?
createTarBucket(bucket, outputBucket) :
createZipBucket(bucket, outputBucket));
+ bucket.free();
if(logMINOR) Logger.minor(this, "We are using
"+archiveType);
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2008-11-27 02:26:54 UTC (rev 23905)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2008-11-27 02:45:55 UTC (rev 23906)
@@ -225,7 +225,7 @@
if(fitsInOneBlockAsIs) {
// Just insert it
ClientPutState bi =
- createInserter(parent, data,
codecNumber, block.desiredURI, ctx, cb, metadata, (int) block.getData().size(),
-1, getCHKOnly, true, true, false);
+ createInserter(parent, data,
codecNumber, block.desiredURI, ctx, cb, metadata, (int) block.getData().size(),
-1, getCHKOnly, true, true, freeData);
cb.onTransition(this, bi);
bi.schedule();
cb.onBlockSetFinished(this);
@@ -234,7 +234,7 @@
if(fitsInOneCHK) {
// Insert single block, then insert pointer to
it
if(reportMetadataOnly) {
- SingleBlockInserter dataPutter = new
SingleBlockInserter(parent, data, codecNumber, FreenetURI.EMPTY_CHK_URI, ctx,
cb, metadata, (int) origSize, -1, getCHKOnly, true, true, token, false);
+ SingleBlockInserter dataPutter = new
SingleBlockInserter(parent, data, codecNumber, FreenetURI.EMPTY_CHK_URI, ctx,
cb, metadata, (int) origSize, -1, getCHKOnly, true, true, token, freeData);
Metadata meta =
makeMetadata(archiveType, null, dataPutter.getURI());
cb.onMetadata(meta, this);
cb.onTransition(this, dataPutter);
@@ -243,7 +243,7 @@
} else {
MultiPutCompletionCallback mcb =
new
MultiPutCompletionCallback(cb, parent, token);
- SingleBlockInserter dataPutter = new
SingleBlockInserter(parent, data, codecNumber, FreenetURI.EMPTY_CHK_URI, ctx,
mcb, metadata, (int) origSize, -1, getCHKOnly, true, false, token, false);
+ SingleBlockInserter dataPutter = new
SingleBlockInserter(parent, data, codecNumber, FreenetURI.EMPTY_CHK_URI, ctx,
mcb, metadata, (int) origSize, -1, getCHKOnly, true, false, token, freeData);
Metadata meta =
makeMetadata(archiveType, null, dataPutter.getURI());
Bucket metadataBucket;
try {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
