Author: toad
Date: 2009-03-20 23:03:02 +0000 (Fri, 20 Mar 2009)
New Revision: 26129
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
Apply patch from saces: fix NPEs
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-03-20 23:01:21 UTC (rev 26128)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-03-20 23:03:02 UTC (rev 26129)
@@ -815,16 +815,16 @@
parent.segmentFinished(this, container, context);
for(int i=0;i<dataBlocks.length;i++) {
if(dataBlocks[i] == null) continue;
- container.activate(dataBlocks[i], 1);
+ if(persistent) container.activate(dataBlocks[i], 1);
dataBlocks[i].free();
- dataBlocks[i].removeFrom(container);
+ if(persistent) dataBlocks[i].removeFrom(container);
dataBlocks[i] = null;
}
for(int i=0;i<checkBlocks.length;i++) {
if(checkBlocks[i] == null) continue;
- container.activate(checkBlocks[i], 1);
+ if(persistent) container.activate(checkBlocks[i], 1);
checkBlocks[i].free();
- checkBlocks[i].removeFrom(container);
+ if(persistent) checkBlocks[i].removeFrom(container);
checkBlocks[i] = null;
}
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
