Author: toad
Date: 2009-03-13 21:10:15 +0000 (Fri, 13 Mar 2009)
New Revision: 26028
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Don't cancel twice, don't cancel after finishing
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-03-13 21:09:53 UTC (rev 26027)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-03-13 21:10:15 UTC (rev 26028)
@@ -1192,7 +1192,10 @@
@Override
public void cancel(ObjectContainer container, ClientContext context) {
- super.cancel();
+ synchronized(this) {
+ if(super.cancel()) return;
+ if(finished) return;
+ }
if(persistent())
container.store(this);
fail(new InsertException(InsertException.CANCELLED), container,
context);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
