[freenet-cvs] r18909 - trunk/freenet/src/freenet/client/async

[toad at freenetproject.org]

Author: toad
Date: 2008-04-02 01:38:48 +0000 (Wed, 02 Apr 2008)
New Revision: 18909

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Refactor/simplify code slightly.

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java	2008-04-02 01:36:23 UTC (rev 18908)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java	2008-04-02 01:38:48 UTC (rev 18909)
@@ -426,17 +426,17 @@
 			return;
 		}
 		if(cooldown) {
-			// Register key to next sub-segment and remove from previous one to save memory (avoid duplication).
+			// Register to the next sub-segment before removing from the old one.
 			sub.getScheduler().addPendingKey(key, sub);
 			seg.unregisterKey(key.getNodeKey());
-			return;
+		} 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());
+			if(logMINOR)
+				Logger.minor(this, "Retrying block "+blockNo+" on "+this+" : tries="+tries+"/"+maxTries+" : "+sub);
+			sub.add(blockNo, false);
 		}
-		// If we are here we are going to retry
-		// Unregister from the old sub-segment before registering on the new.
-		seg.unregisterKey(key.getNodeKey());
-		if(logMINOR)
-			Logger.minor(this, "Retrying block "+blockNo+" on "+this+" : tries="+tries+"/"+maxTries+" : "+sub);
-		sub.add(blockNo, false);
 	}
 	
 	private SplitFileFetcherSubSegment getSubSegment(int retryCount) {