Author: toad
Date: 2009-03-26 15:28:40 +0000 (Thu, 26 Mar 2009)
New Revision: 26207
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Remove subsidiary metadata
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-03-26 15:27:26 UTC (rev 26206)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-03-26 15:28:40 UTC (rev 26207)
@@ -1267,8 +1267,8 @@
}
boolean fin = false;
ClientPutState oldState;
+ Metadata token = (Metadata) state.getToken();
synchronized(this) {
- Metadata token = (Metadata) state.getToken();
if(persistent()) container.activate(token, 1);
oldState = metadataPuttersByMetadata.remove(token);
if(!metadataPuttersByMetadata.isEmpty()) {
@@ -1291,6 +1291,8 @@
}
}
}
+ if(token != baseMetadata)
+ token.removeFrom(container);
if(persistent()) {
container.store(metadataPuttersByMetadata);
container.deactivate(metadataPuttersByMetadata, 1);
@@ -1309,11 +1311,13 @@
container.activate(metadataPuttersByMetadata, 2);
}
ClientPutState oldState;
+ Metadata token = (Metadata) state.getToken();
synchronized(this) {
- Metadata token = (Metadata) state.getToken();
if(persistent()) container.activate(token, 1);
oldState = metadataPuttersByMetadata.remove(token);
}
+ if(token != baseMetadata)
+ token.removeFrom(container);
if(persistent()) {
container.store(metadataPuttersByMetadata);
container.deactivate(metadataPuttersByMetadata, 1);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
