Author: toad
Date: 2008-12-16 23:49:11 +0000 (Tue, 16 Dec 2008)
New Revision: 24398
Modified:
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
Remove unnecessary argument codec
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2008-12-16 23:44:07 UTC (rev 24397)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2008-12-16 23:49:11 UTC (rev 24398)
@@ -235,7 +235,7 @@
// 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, freeData);
- Metadata meta =
makeMetadata(archiveType, null, dataPutter.getURI());
+ Metadata meta =
makeMetadata(archiveType, dataPutter.getURI());
cb.onMetadata(meta, this);
cb.onTransition(this, dataPutter);
dataPutter.schedule();
@@ -244,7 +244,7 @@
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, freeData);
- Metadata meta =
makeMetadata(archiveType, null, dataPutter.getURI());
+ Metadata meta =
makeMetadata(archiveType, dataPutter.getURI());
Bucket metadataBucket;
try {
metadataBucket =
BucketTools.makeImmutableBucket(ctx.bf, meta.writeToByteArray());
@@ -295,12 +295,12 @@
}
}
- private Metadata makeMetadata(ARCHIVE_TYPE archiveType, COMPRESSOR_TYPE
codec, FreenetURI uri) {
+ private Metadata makeMetadata(ARCHIVE_TYPE archiveType, FreenetURI uri)
{
Metadata meta = null;
if(archiveType != null)
- meta = new Metadata(Metadata.ARCHIVE_MANIFEST,
archiveType, codec, uri, block.clientMetadata);
+ meta = new Metadata(Metadata.ARCHIVE_MANIFEST,
archiveType, null, uri, block.clientMetadata);
else // redirect
- meta = new Metadata(Metadata.SIMPLE_REDIRECT,
archiveType, codec, uri, block.clientMetadata);
+ meta = new Metadata(Metadata.SIMPLE_REDIRECT,
archiveType, null, uri, block.clientMetadata);
if(targetFilename != null) {
HashMap hm = new HashMap();
hm.put(targetFilename, meta);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
