Author: toad
Date: 2009-01-30 18:13:09 +0000 (Fri, 30 Jan 2009)
New Revision: 25405
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
More activation/deactivation
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-01-30 18:08:18 UTC (rev 25404)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-01-30 18:13:09 UTC (rev 25405)
@@ -793,6 +793,7 @@
container.activate(metadataPuttersByMetadata, 2);
for(int i=0;i<metas.length;i++) {
Metadata m = metas[i];
+ if(persistent()) container.activate(m, 100);
synchronized(this) {
if(metadataPuttersByMetadata.containsKey(m)) {
if(logMINOR) Logger.minor(this,
"Already started insert for "+m+" in resolve() for "+metas.length+"
Metadata's");
@@ -801,6 +802,7 @@
}
if(m.isResolved()) {
Logger.error(this, "Already resolved: "+m+" in
resolve() - race condition???");
+ if(persistent()) container.deactivate(m, 1);
continue;
}
try {
@@ -814,10 +816,13 @@
this.metadataPuttersByMetadata.put(m,
metadataInserter);
}
metadataInserter.start(null, container,
context);
- if(persistent())
+ if(persistent()) {
container.deactivate(metadataInserter,
1);
+ container.deactivate(m, 1);
+ }
} catch (MetadataUnresolvedException e1) {
resolve(e1, container, context);
+ container.deactivate(m, 1);
}
}
if(persistent()) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
