Author: nextgens
Date: 2009-01-27 20:48:21 +0000 (Tue, 27 Jan 2009)
New Revision: 25335
Modified:
trunk/freenet/
trunk/freenet/src/freenet/client/async/ClientPutter.java
Log:
backport r25282 as requested by toad (it was preventing us from cancelling
inserts)
Property changes on: trunk/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o/freenet:25332
+ /branches/db4o/freenet:25282,25332
Modified: trunk/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientPutter.java 2009-01-27
20:46:56 UTC (rev 25334)
+++ trunk/freenet/src/freenet/client/async/ClientPutter.java 2009-01-27
20:48:21 UTC (rev 25335)
@@ -215,8 +215,6 @@
if(cancelled) return;
super.cancel();
oldState = currentState;
- if(startedStarting) return;
- startedStarting = true;
}
if(oldState != null) oldState.cancel();
onFailure(new InsertException(InsertException.CANCELLED), null);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
