[freenet-cvs] r20940 - branches/db4o/freenet/src/freenet/client/async

[toad at freenetproject.org]

Author: toad
Date: 2008-07-02 17:38:06 +0000 (Wed, 02 Jul 2008)
New Revision: 20940

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Register on the new subsegment before unregistering from the old.

Modified: branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java	2008-07-02 17:00:11 UTC (rev 20939)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java	2008-07-02 17:38:06 UTC (rev 20940)
@@ -570,11 +570,10 @@
 				Logger.minor(this, "Adding to cooldown queue: "+key+" for "+this+" was on segment "+seg+" now registered to "+sub);
 		} else {
 			// If we are here we are going to retry
-			// Unregister from the old sub-segment before registering on the new.
-			seg.unregisterKey(key.getNodeKey(), context, container);
 			if(logMINOR)
 				Logger.minor(this, "Retrying block "+blockNo+" on "+this+" : tries="+tries+"/"+maxTries+" : "+sub);
 			sub.add(blockNo, false, container, context, false);
+			seg.unregisterKey(key.getNodeKey(), context, container);
 		}
 	}