Author: toad
Date: 2009-04-01 14:25:24 +0000 (Wed, 01 Apr 2009)
New Revision: 26311
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
Log:
Juggle activations slightly
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2009-04-01 14:24:43 UTC (rev 26310)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
2009-04-01 14:25:24 UTC (rev 26311)
@@ -778,8 +778,6 @@
if(logMINOR) Logger.minor(this, "Failing: "+e, e);
ClientPutState oldSFI = null;
ClientPutState oldMetadataPutter = null;
- if(persistent)
- container.activate(block, 2);
synchronized(this) {
if(finished){
return;
@@ -794,12 +792,15 @@
container.activate(oldSFI, 1);
if(oldMetadataPutter != null)
container.activate(oldMetadataPutter,
1);
- container.activate(cb, 1);
}
if(oldSFI != null)
oldSFI.cancel(container, context);
if(oldMetadataPutter != null)
oldMetadataPutter.cancel(container, context);
+ if(persistent) {
+ container.activate(block, 2);
+ container.activate(cb, 1);
+ }
synchronized(this) {
if(freeData)
block.free(container);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
