Author: toad
Date: 2009-03-25 23:48:38 +0000 (Wed, 25 Mar 2009)
New Revision: 26192
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
shouldFreeData not freeData - we need to free the data if it is the compressed
tempfile
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2009-03-25 23:37:15 UTC (rev 26191)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2009-03-25 23:48:38 UTC (rev 26192)
@@ -260,7 +260,7 @@
data = fixNotPersistent(data, context);
// Just insert it
ClientPutState bi =
- createInserter(parent, data,
codecNumber, ctx, cb, metadata, (int)block.getData().size(), -1, getCHKOnly,
true, container, context, freeData);
+ createInserter(parent, data,
codecNumber, ctx, cb, metadata, (int)block.getData().size(), -1, getCHKOnly,
true, container, context, shouldFreeData);
if(logMINOR)
Logger.minor(this, "Inserting without
metadata: "+bi+" for "+this);
cb.onTransition(this, bi, container);
@@ -286,7 +286,7 @@
data = fixNotPersistent(data, context);
}
if(reportMetadataOnly) {
- SingleBlockInserter dataPutter = new
SingleBlockInserter(parent, data, codecNumber, persistent ?
FreenetURI.EMPTY_CHK_URI.clone() : FreenetURI.EMPTY_CHK_URI, ctx, cb, metadata,
(int)origSize, -1, getCHKOnly, true, true, token, container, context,
persistent, freeData);
+ SingleBlockInserter dataPutter = new
SingleBlockInserter(parent, data, codecNumber, persistent ?
FreenetURI.EMPTY_CHK_URI.clone() : FreenetURI.EMPTY_CHK_URI, ctx, cb, metadata,
(int)origSize, -1, getCHKOnly, true, true, token, container, context,
persistent, shouldFreeData);
if(logMINOR)
Logger.minor(this, "Inserting with
metadata: "+dataPutter+" for "+this);
Metadata meta = makeMetadata(archiveType,
dataPutter.getURI(container, context));
@@ -297,7 +297,7 @@
} else {
MultiPutCompletionCallback mcb =
new MultiPutCompletionCallback(cb,
parent, token);
- SingleBlockInserter dataPutter = new
SingleBlockInserter(parent, data, codecNumber, persistent ?
FreenetURI.EMPTY_CHK_URI.clone() : FreenetURI.EMPTY_CHK_URI, ctx, mcb,
metadata, (int)origSize, -1, getCHKOnly, true, false, token, container,
context, persistent, freeData);
+ SingleBlockInserter dataPutter = new
SingleBlockInserter(parent, data, codecNumber, persistent ?
FreenetURI.EMPTY_CHK_URI.clone() : FreenetURI.EMPTY_CHK_URI, ctx, mcb,
metadata, (int)origSize, -1, getCHKOnly, true, false, token, container,
context, persistent, shouldFreeData);
if(logMINOR)
Logger.minor(this, "Inserting data:
"+dataPutter+" for "+this);
Metadata meta = makeMetadata(archiveType,
dataPutter.getURI(container, context));
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
