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

[t...@freenetproject.org]

Author: toad
Date: 2008-08-29 22:47:30 +0000 (Fri, 29 Aug 2008)
New Revision: 22227

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Logging


Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-08-29 22:44:51 UTC (rev 22226)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-08-29 22:47:30 UTC (rev 22227)
@@ -219,7 +219,17 @@
                        }
                        if(blockNo < dataKeys.length) {
                                if(dataKeys[blockNo] == null) {
-                                       if(!startedDecode) Logger.error(this, 
"Block already finished: "+blockNo);
+                                       if(!startedDecode) {
+                                               // This can happen.
+                                               // We queue a persistent 
download, we queue a transient.
+                                               // The transient goes through 
DatastoreChecker first,
+                                               // and feeds the block to us. 
We don't finish, because
+                                               // we need more blocks. Then 
the persistent goes through
+                                               // the DatastoreChecker, and 
calls us again with the same
+                                               // block.
+                                               if(logMINOR)
+                                                       Logger.minor(this, 
"Block already finished: "+blockNo);
+                                       }
                                        data.free();
                                        return;
                                }
@@ -233,7 +243,10 @@
                        } else if(blockNo < checkKeys.length + dataKeys.length) 
{
                                blockNo -= dataKeys.length;
                                if(checkKeys[blockNo] == null) {
-                                       if(!startedDecode) Logger.error(this, 
"Check block already finished: "+blockNo);
+                                       if(!startedDecode) {
+                                               if(logMINOR)
+                                                       Logger.minor(this, 
"Check block already finished: "+blockNo);
+                                       }
                                        data.free();
                                        return;
                                }