Author: toad
Date: 2009-02-04 22:43:08 +0000 (Wed, 04 Feb 2009)
New Revision: 25570
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
Fix progress on transient inserts.
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 22:14:05 UTC (rev 25569)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 22:43:08 UTC (rev 25570)
@@ -1063,14 +1063,12 @@
completed = blocksCompleted;
succeeded = blocksSucceeded;
}
- if(persistent) {
- container.activate(putter, 1);
- if(failedBlock)
- putter.failedBlock(container, context);
- else if(treatAsSuccess)
- putter.completedBlock(false, container,
context);
- container.deactivate(putter, 1);
- }
+ container.activate(putter, 1);
+ if(failedBlock)
+ putter.failedBlock(container, context);
+ else if(treatAsSuccess)
+ putter.completedBlock(false, container, context);
+ container.deactivate(putter, 1);
if(succeeded == dataBlocks.length) {
if(persistent) container.activate(parent, 1);
parent.segmentFetchable(this, container);
@@ -1142,11 +1140,9 @@
completed = blocksCompleted;
succeeded = blocksSucceeded;
}
- if(persistent) {
- if(persistent) container.activate(putter, 1);
- putter.completedBlock(false, container, context);
- if(persistent) container.deactivate(putter, 1);
- }
+ if(persistent) container.activate(putter, 1);
+ putter.completedBlock(false, container, context);
+ 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
