Author: toad
Date: 2009-02-14 16:03:10 +0000 (Sat, 14 Feb 2009)
New Revision: 25649
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
Log:
Activation
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-14 16:02:49 UTC (rev 25648)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2009-02-14 16:03:10 UTC (rev 25649)
@@ -470,7 +470,13 @@
for(int i=0;i<dataBlocks.length;i++) {
if(dataURIs[i] == null && dataBlocks[i] != null) {
try {
+ boolean deactivate = false;
+ if(persistent) {
+ deactivate =
!container.ext().isActive(dataBlocks[i]);
+ if(deactivate)
container.activate(dataBlocks[i], 1);
+ }
ClientCHK key = (ClientCHK)
encodeBucket(dataBlocks[i]).getClientKey();
+ if(deactivate)
container.deactivate(dataBlocks[i], 1);
onEncode(i, key, container, context);
} catch (CHKEncodeException e) {
fail(new
InsertException(InsertException.INTERNAL_ERROR, e, null), container, context);
@@ -485,7 +491,13 @@
for(int i=0;i<checkBlocks.length;i++) {
if(checkURIs[i] == null && checkBlocks[i] !=
null) {
try {
+ boolean deactivate = false;
+ if(persistent) {
+ deactivate =
!container.ext().isActive(checkBlocks[i]);
+ if(deactivate)
container.activate(checkBlocks[i], 1);
+ }
ClientCHK key = (ClientCHK)
encodeBucket(checkBlocks[i]).getClientKey();
+ if(deactivate)
container.deactivate(checkBlocks[i], 1);
onEncode(i, key, container,
context);
} catch (CHKEncodeException e) {
fail(new
InsertException(InsertException.INTERNAL_ERROR, e, null), container, context);
@@ -1228,7 +1240,7 @@
@Override
public short getPriorityClass(ObjectContainer container) {
- if(persistent) container.activate(parent, 1);
+ if(persistent) container.activate(putter, 1);
return putter.getPriorityClass();
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
