Author: toad
Date: 2009-03-24 16:46:17 +0000 (Tue, 24 Mar 2009)
New Revision: 26159
Modified:
branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
Log:
Do not store(this) in cancel() after calling fetcher.cancel, because
fetcher.cancel will call onCancelled, which will call removeFrom()
Modified: branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
2009-03-24 16:06:07 UTC (rev 26158)
+++ branches/db4o/freenet/src/freenet/client/async/USKFetcherTag.java
2009-03-24 16:46:17 UTC (rev 26159)
@@ -105,22 +105,10 @@
public void cancel(ObjectContainer container, ClientContext context) {
if(fetcher != null) fetcher.cancel(null, context);
- finish(context);
- }
-
- private void finish(ClientContext context) {
synchronized(this) {
finished = true;
}
- if(persistent) {
- context.jobRunner.queue(new DBJob() {
-
- public void run(ObjectContainer container,
ClientContext context) {
- container.store(USKFetcherTag.this);
- }
-
- }, NativeThread.HIGH_PRIORITY, false);
- }
+ // onCancelled() will removeFrom(), so we do NOT want to
store(this)
}
public long getToken() {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
