Author: toad
Date: 2008-12-23 14:33:49 +0000 (Tue, 23 Dec 2008)
New Revision: 24766
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Fix NPE on fatal failure on transient request
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-23 13:51:14 UTC (rev 24765)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-12-23 14:33:49 UTC (rev 24766)
@@ -716,7 +716,8 @@
Logger.error(this, "Block already
finished: "+blockNo);
return;
}
- container.activate(dataKeys[blockNo], 1);
+ if(persistent)
+ container.activate(dataKeys[blockNo],
1);
dataKeys[blockNo].removeFrom(container);
dataKeys[blockNo] = null;
} else if(blockNo < checkKeys.length + dataKeys.length)
{
@@ -724,7 +725,8 @@
Logger.error(this, "Check block already
finished: "+blockNo);
return;
}
-
container.activate(checkKeys[blockNo-dataKeys.length], 1);
+ if(persistent)
+
container.activate(checkKeys[blockNo-dataKeys.length], 1);
checkKeys[blockNo-dataKeys.length].removeFrom(container);
checkKeys[blockNo-dataKeys.length] = null;
} else
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
