Author: toad
Date: 2008-12-23 17:10:17 +0000 (Tue, 23 Dec 2008)
New Revision: 24779
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
More NPEs
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-23 17:06:43 UTC (rev 24778)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-23 17:10:17 UTC (rev 24779)
@@ -716,18 +716,20 @@
Logger.error(this, "Block already
finished: "+blockNo);
return;
}
- if(persistent)
+ if(persistent) {
container.activate(dataKeys[blockNo],
1);
- dataKeys[blockNo].removeFrom(container);
+ dataKeys[blockNo].removeFrom(container);
+ }
dataKeys[blockNo] = null;
} else if(blockNo < checkKeys.length + dataKeys.length)
{
if(checkKeys[blockNo-dataKeys.length] == null) {
Logger.error(this, "Check block already
finished: "+blockNo);
return;
}
- if(persistent)
+ if(persistent) {
container.activate(checkKeys[blockNo-dataKeys.length], 1);
-
checkKeys[blockNo-dataKeys.length].removeFrom(container);
+
checkKeys[blockNo-dataKeys.length].removeFrom(container);
+ }
checkKeys[blockNo-dataKeys.length] = null;
} else
Logger.error(this, "Unrecognized block number:
"+blockNo, new Exception("error"));
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
