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

[t...@freenetproject.org]

Author: toad
Date: 2007-02-20 17:47:13 +0000 (Tue, 20 Feb 2007)
New Revision: 11853

Modified:
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Another accounting bug

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2007-02-20 17:41:18 UTC (rev 11852)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2007-02-20 17:47:13 UTC (rev 11853)
@@ -289,10 +289,13 @@
                        } else
                                Logger.error(this, "Unrecognized block number: 
"+blockNo, new Exception("error"));
                        // :(
-                       if(e.isFatal())
+                       if(e.isFatal()) {
                                fatallyFailedBlocks++;
-                       else
+                               parentFetcher.parent.fatallyFailedBlock();
+                       } else {
                                failedBlocks++;
+                               parentFetcher.parent.failedBlock();
+                       }
                        if(failedBlocks + fatallyFailedBlocks <= 
(dataKeys.length + checkKeys.length - minFetched))
                                return;
                }

Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2007-02-20 17:41:18 UTC (rev 11852)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java      
2007-02-20 17:47:13 UTC (rev 11853)
@@ -120,10 +120,8 @@
                }
                segment.errors.inc(e.getMode());
                if(e.isFatal() || forceFatal) {
-                       parent.fatallyFailedBlock();
                        segment.onFatalFailure(e, token);
                } else {
-                       parent.failedBlock();
                        segment.onNonFatalFailure(e, token);
                }
        }