Author: toad
Date: 2009-02-04 19:32:53 +0000 (Wed, 04 Feb 2009)
New Revision: 25557
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
Doh, remove the blockNum
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 19:24:51 UTC (rev 25556)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 19:32:53 UTC (rev 25557)
@@ -969,6 +969,7 @@
checkFinished[checkNum] = true;
checkFailed[checkNum] = true;
blocksCompleted++;
+ blocks.remove(blockNum);
if(checkBlocks[checkNum] !=
null) {
if(persistent)
container.activate(checkBlocks[checkNum], 1);
checkBlocks[checkNum].free();
@@ -988,6 +989,7 @@
checkFailed[checkNum] = false; //
Treating as succeeded
blocksCompleted++;
blocksSucceeded++;
+ blocks.remove(blockNum);
if(checkBlocks[checkNum] != null) {
if(persistent)
container.activate(checkBlocks[checkNum], 1);
checkBlocks[checkNum].free();
@@ -1025,6 +1027,7 @@
dataFinished[blockNum] = true;
dataFailed[blockNum] = true;
blocksCompleted++;
+ blocks.remove(blockNum);
if(dataBlocks[blockNum] !=
null) {
if(persistent)
container.activate(dataBlocks[blockNum], 1);
dataBlocks[blockNum].free();
@@ -1044,6 +1047,7 @@
dataFailed[blockNum] = false; //
Treating as succeeded
blocksCompleted++;
blocksSucceeded++;
+ blocks.remove(blockNum);
if(dataBlocks[blockNum] != null &&
encoded) {
if(persistent)
container.activate(dataBlocks[blockNum], 1);
dataBlocks[blockNum].free();
@@ -1093,6 +1097,7 @@
checkFailed[checkNum] = false;
blocksCompleted++;
blocksSucceeded++;
+ blocks.remove(blockNum);
} else {
if(checkFailed[checkNum])
Logger.error(this, "Got
onSuccess() but block has already failed! Check block "+checkNum+" on "+this);
@@ -1115,6 +1120,7 @@
dataFailed[blockNum] = false;
blocksCompleted++;
blocksSucceeded++;
+ blocks.remove(blockNum);
} else {
if(dataFailed[blockNum])
Logger.error(this, "Got
onSuccess() but block has already failed! Data block "+blockNum+" on "+this);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
