r26725 - trunk/freenet/src/freenet/client/async

[email protected]
Newsgroups gmane.network.freenet.cvs
Message-ID <[email protected]>
Author: toad
Date: 2009-04-10 20:25:38 +0000 (Fri, 10 Apr 2009)
New Revision: 26725

Modified:
   trunk/freenet/src/freenet/client/async/ClientPutter.java
   trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
ctx is passed in, don't remove it because ClientPut* will remove it.


Modified: trunk/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientPutter.java	2009-04-10 19:35:06 UTC (rev 26724)
+++ trunk/freenet/src/freenet/client/async/ClientPutter.java	2009-04-10 20:25:38 UTC (rev 26725)
@@ -353,8 +353,9 @@
 	public void removeFrom(ObjectContainer container, ClientContext context) {
 		container.activate(cm, 2);
 		cm.removeFrom(container);
-		container.activate(ctx, 1);
-		ctx.removeFrom(container);
+		// This is passed in. We should not remove it, because the caller (ClientPutBase) should remove it.
+//		container.activate(ctx, 1);
+//		ctx.removeFrom(container);
 		container.activate(targetURI, 5);
 		targetURI.removeFrom(container);
 		if(uri != null) {

Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java	2009-04-10 19:35:06 UTC (rev 26724)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java	2009-04-10 20:25:38 UTC (rev 26725)
@@ -1664,8 +1664,9 @@
 		}
 		container.activate(targetURI, 5);
 		targetURI.removeFrom(container);
-		container.activate(ctx, 1);
-		ctx.removeFrom(container);
+		// This is passed in. We should not remove it, because the caller (ClientPutDir) should remove it.
+//		container.activate(ctx, 1);
+//		ctx.removeFrom(container);
 		container.activate(metadataPuttersByMetadata, 2);
 		container.activate(metadataPuttersUnfetchable, 2);
 		ArrayList<Metadata> metas = null;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.