Author: toad
Date: 2008-06-13 12:22:50 +0000 (Fri, 13 Jun 2008)
New Revision: 20289
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
More argument passing/compile fixes
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2008-06-13 12:22:40 UTC (rev 20288)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2008-06-13 12:22:50 UTC (rev 20289)
@@ -197,7 +197,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);
- Metadata meta =
makeMetadata(dataPutter.getURI());
+ Metadata meta =
makeMetadata(dataPutter.getURI(container, context));
cb.onMetadata(meta, this, container, context);
cb.onTransition(this, dataPutter, container);
dataPutter.schedule(container, context);
@@ -206,7 +206,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);
- Metadata meta =
makeMetadata(dataPutter.getURI());
+ Metadata meta =
makeMetadata(dataPutter.getURI(container, context));
Bucket metadataBucket;
try {
metadataBucket =
BucketTools.makeImmutableBucket(ctx.bf, meta.writeToByteArray());
@@ -226,7 +226,7 @@
mcb.arm(container, context);
dataPutter.schedule(container, context);
if(metaPutter instanceof SingleBlockInserter)
-
((SingleBlockInserter)metaPutter).encode(container);
+
((SingleBlockInserter)metaPutter).encode(container, context);
metaPutter.schedule(container, context);
cb.onBlockSetFinished(this, container);
}
@@ -241,14 +241,14 @@
SplitFileInserter sfi = new SplitFileInserter(parent,
cb, data, bestCodec, origSize, block.clientMetadata, ctx, getCHKOnly, metadata,
token, insertAsArchiveManifest, freeData);
cb.onTransition(this, sfi, container);
sfi.start(container, context);
- if(earlyEncode) sfi.forceEncode();
+ if(earlyEncode) sfi.forceEncode(context);
} else {
SplitHandler sh = new SplitHandler();
SplitFileInserter sfi = new SplitFileInserter(parent,
sh, data, bestCodec, origSize, block.clientMetadata, ctx, getCHKOnly, metadata,
token, insertAsArchiveManifest, freeData);
sh.sfi = sfi;
cb.onTransition(this, sh, container);
sfi.start(container, context);
- if(earlyEncode) sfi.forceEncode();
+ if(earlyEncode) sfi.forceEncode(context);
}
}
@@ -306,7 +306,7 @@
new SingleBlockInserter(parent, data,
compressionCodec, uri, ctx, cb, isMetadata, sourceLength, token,
getCHKOnly, addToParent, false,
this.token);
if(encodeCHK)
- cb.onEncode(sbi.getBlock().getClientKey(),
this, container, context);
+ cb.onEncode(sbi.getBlock(container,
context).getClientKey(), this, container, context);
return sbi;
}
@@ -656,7 +656,7 @@
if(logMINOR) Logger.minor(this,
"Started metadata inserter: "+putter+" for "+this);
} else {
// Get all the URIs ASAP so we can
start to insert the metadata.
-
((SplitFileInserter)splitInserter).forceEncode();
+
((SplitFileInserter)splitInserter).forceEncode(context);
}
} catch (InsertException e1) {
Logger.error(this, "Failing "+this+" : "+e1,
e1);
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2008-06-13 12:22:40 UTC (rev 20288)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2008-06-13 12:22:50 UTC (rev 20289)
@@ -682,7 +682,7 @@
for (int i = 0; i < dataBlockInserters.length; i++) {
SingleBlockInserter sbi = dataBlockInserters[i];
if (sbi != null)
- sbi.cancel(container);
+ sbi.cancel(container, context);
Bucket d = dataBlocks[i];
if (d != null) {
d.free();
@@ -692,7 +692,7 @@
for (int i = 0; i < checkBlockInserters.length; i++) {
SingleBlockInserter sbi = checkBlockInserters[i];
if (sbi != null)
- sbi.cancel(container);
+ sbi.cancel(container, context);
Bucket d = checkBlocks[i];
if (d != null) {
d.free();
