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

[toad at freenetproject.org]

Author: toad
Date: 2008-04-02 01:36:23 +0000 (Wed, 02 Apr 2008)
New Revision: 18908

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Move conditional up a bit, no functional impact

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java	2008-04-02 01:34:57 UTC (rev 18907)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java	2008-04-02 01:36:23 UTC (rev 18908)
@@ -419,18 +419,18 @@
 				}
 			}
 		}
+		if(failed) {
+			onFatalFailure(e, blockNo, seg);
+			if(logMINOR)
+				Logger.minor(this, "Not retrying block "+blockNo+" on "+this+" : tries="+tries+"/"+maxTries);
+			return;
+		}
 		if(cooldown) {
 			// Register key to next sub-segment and remove from previous one to save memory (avoid duplication).
 			sub.getScheduler().addPendingKey(key, sub);
 			seg.unregisterKey(key.getNodeKey());
 			return;
 		}
-		if(failed) {
-			onFatalFailure(e, blockNo, seg);
-			if(logMINOR)
-				Logger.minor(this, "Not retrying block "+blockNo+" on "+this+" : tries="+tries+"/"+maxTries);
-			return;
-		}
 		// If we are here we are going to retry
 		// Unregister from the old sub-segment before registering on the new.
 		seg.unregisterKey(key.getNodeKey());