Author: toad
Date: 2009-04-03 13:50:15 +0000 (Fri, 03 Apr 2009)
New Revision: 26431
Modified:
trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
Parent might not be active
Modified: trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
2009-04-03 13:48:14 UTC (rev 26430)
+++ trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
2009-04-03 13:50:15 UTC (rev 26431)
@@ -35,7 +35,7 @@
container.activate(waitingForFetchable, 1);
}
- public MultiPutCompletionCallback(PutCompletionCallback cb,
BaseClientPutter parent, Object token) {
+ public MultiPutCompletionCallback(PutCompletionCallback cb,
BaseClientPutter parent, Object token, boolean persistent) {
this.cb = cb;
waitingFor = new Vector();
waitingForBlockSet = new Vector();
@@ -43,7 +43,7 @@
this.parent = parent;
this.token = token;
finished = false;
- this.persistent = parent.persistent();
+ this.persistent = persistent;
}
public void onSuccess(ClientPutState state, ObjectContainer container,
ClientContext context) {
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2009-04-03 13:48:14 UTC (rev 26430)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2009-04-03 13:50:15 UTC (rev 26431)
@@ -296,7 +296,7 @@
cb.onBlockSetFinished(this, container, context);
} else {
MultiPutCompletionCallback mcb =
- new MultiPutCompletionCallback(cb,
parent, token);
+ new MultiPutCompletionCallback(cb,
parent, token, persistent);
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);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
