Author: toad
Date: 2009-02-04 22:52:05 +0000 (Wed, 04 Feb 2009)
New Revision: 25572
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
Another activation NPE
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 22:47:23 UTC (rev 25571)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 22:52:05 UTC (rev 25572)
@@ -1064,12 +1064,12 @@
completed = blocksCompleted;
succeeded = blocksSucceeded;
}
- container.activate(putter, 1);
+ if(persistent) container.activate(putter, 1);
if(failedBlock)
putter.failedBlock(container, context);
else if(treatAsSuccess)
putter.completedBlock(false, container, context);
- container.deactivate(putter, 1);
+ if(persistent) container.deactivate(putter, 1);
if(succeeded == dataBlocks.length) {
if(persistent) container.activate(parent, 1);
parent.segmentFetchable(this, container);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
