Author: toad
Date: 2009-02-04 20:03:29 +0000 (Wed, 04 Feb 2009)
New Revision: 25564
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
More transient insert NPE fixes
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 19:50:58 UTC (rev 25563)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-04 20:03:29 UTC (rev 25564)
@@ -1072,13 +1072,13 @@
container.deactivate(putter, 1);
}
if(succeeded == dataBlocks.length) {
- container.activate(parent, 1);
+ if(persistent) container.activate(parent, 1);
parent.segmentFetchable(this, container);
- container.deactivate(parent, 1);
+ if(persistent) container.deactivate(parent, 1);
} else if(completed == dataBlocks.length + checkBlocks.length) {
- container.activate(parent, 1);
+ if(persistent) container.activate(parent, 1);
finish(container, context, parent);
- container.deactivate(parent, 1);
+ if(persistent) container.deactivate(parent, 1);
}
}
@@ -1143,18 +1143,18 @@
succeeded = blocksSucceeded;
}
if(persistent) {
- container.activate(putter, 1);
+ if(persistent) container.activate(putter, 1);
putter.completedBlock(false, container, context);
- container.deactivate(putter, 1);
+ if(persistent) container.deactivate(putter, 1);
}
if(succeeded == dataBlocks.length) {
- container.activate(parent, 1);
+ if(persistent) container.activate(parent, 1);
parent.segmentFetchable(this, container);
- container.deactivate(parent, 1);
+ if(persistent) container.deactivate(parent, 1);
} else if(completed == dataBlocks.length + checkBlocks.length) {
- container.activate(parent, 1);
+ if(persistent) container.activate(parent, 1);
finish(container, context, parent);
- container.deactivate(parent, 1);
+ if(persistent) container.deactivate(parent, 1);
}
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
