Author: toad
Date: 2008-06-13 12:04:53 +0000 (Fri, 13 Jun 2008)
New Revision: 20282
Modified:
branches/db4o/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
Fix BackgroundBlockEncoder
Modified:
branches/db4o/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
2008-06-13 12:01:30 UTC (rev 20281)
+++ branches/db4o/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
2008-06-13 12:04:53 UTC (rev 20282)
@@ -19,11 +19,16 @@
// Minimize memory usage at the cost of having to encode from the end
private final ArrayList queue;
+ private ClientContext context;
public BackgroundBlockEncoder() {
queue = new ArrayList();
}
+ public void setContext(ClientContext context) {
+ this.context = context;
+ }
+
public void queue(SingleBlockInserter sbi, ObjectContainer container,
ClientContext context) {
if(sbi.isCancelled()) return;
if(sbi.resultingURI != null) return;
@@ -98,7 +103,7 @@
Logger.minor(this, "Encoding "+sbi);
if(sbi.isCancelled()) continue;
if(sbi.resultingURI != null) continue;
- sbi.tryEncode(null);
+ sbi.tryEncode(null, context);
}
}
@@ -124,7 +129,7 @@
if(sbi == null) continue; // deleted
if(sbi.isCancelled()) continue;
if(sbi.resultingURI != null) continue;
- sbi.tryEncode();
+ sbi.tryEncode(container, context);
} catch (Throwable t) {
Logger.error(this, "Caught "+t, t);
} finally {
Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-06-13
12:01:30 UTC (rev 20281)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-06-13
12:04:53 UTC (rev 20282)
@@ -420,6 +420,7 @@
}
public void start(Config config) throws NodeInitException {
+ backgroundBlockEncoder.setContext(clientContext);
node.executor.execute(backgroundBlockEncoder, "Background block
encoder");
persister.start();
if(fcpServer != null)
