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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-16 22:28:22 +0000 (Wed, 16 Jul 2008)
New Revision: 21153

Modified:
   
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Logging, more or less

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-07-16 22:21:58 UTC (rev 21152)
+++ 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-07-16 22:28:22 UTC (rev 21153)
@@ -197,7 +197,11 @@
                                ret = (Integer) blockNums.get(x);
                                Key key = 
segment.getBlockNodeKey(((Integer)ret).intValue(), container);
                                if(key == null) {
-                                       Logger.error(this, "Key is null for 
block "+ret+" for "+this+" in hasValidKeys()");
+                                       if(segment.isFinishing(container) || 
segment.isFinished(container)) return false;
+                                       
if(segment.haveBlock(((Integer)ret).intValue(), container))
+                                               Logger.error(this, "Already 
have block "+ret+" but was in blockNums on "+this+" in hasValidKeys");
+                                       else
+                                               Logger.error(this, "Key is null 
for block "+ret+" for "+this+" in hasValidKeys");
                                        blockNums.remove(x);
                                        if(persistent && !hasSet) {
                                                hasSet = true;