Author: toad
Date: 2008-06-13 12:24:14 +0000 (Fri, 13 Jun 2008)
New Revision: 20292
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
More minor insert fixes (parameter passing)
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2008-06-13 12:23:24 UTC (rev 20291)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2008-06-13 12:24:14 UTC (rev 20292)
@@ -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(context);
+ if(earlyEncode) sfi.forceEncode(container, 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(context);
+ if(earlyEncode) sfi.forceEncode(container, context);
}
}
@@ -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(context);
+
((SplitFileInserter)splitInserter).forceEncode(container, context);
}
} catch (InsertException e1) {
Logger.error(this, "Failing "+this+" : "+e1,
e1);
Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
2008-06-13 12:23:24 UTC (rev 20291)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileInserter.java
2008-06-13 12:24:14 UTC (rev 20292)
@@ -253,7 +253,7 @@
}
}
}
- if(encode) segment.forceEncode(context);
+ if(encode) segment.forceEncode(container, context);
if(ret) return;
cb.onBlockSetFinished(this, container);
if(countDataBlocks > 32)
@@ -455,13 +455,13 @@
}
/** Force the remaining blocks which haven't been encoded so far to be
encoded ASAP. */
- public void forceEncode(ClientContext context) {
+ public void forceEncode(ObjectContainer container, ClientContext
context) {
Logger.minor(this, "Forcing encode on "+this);
synchronized(this) {
forceEncode = true;
}
for(int i=0;i<segments.length;i++) {
- segments[i].forceEncode(context);
+ segments[i].forceEncode(container, context);
}
}
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2008-06-13 12:23:24 UTC (rev 20291)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2008-06-13 12:24:14 UTC (rev 20292)
@@ -733,8 +733,8 @@
* Force the remaining blocks which haven't been encoded so far to be
* encoded ASAP.
*/
- public void forceEncode(ClientContext context) {
- context.backgroundBlockEncoder.queue(dataBlockInserters);
- context.backgroundBlockEncoder.queue(checkBlockInserters);
+ public void forceEncode(ObjectContainer container, ClientContext
context) {
+ context.backgroundBlockEncoder.queue(dataBlockInserters,
container, context);
+ context.backgroundBlockEncoder.queue(checkBlockInserters,
container, context);
}
}
