Author: j16sdiz
Date: 2009-03-09 11:40:21 +0000 (Mon, 09 Mar 2009)
New Revision: 25974
Modified:
trunk/freenet/
trunk/freenet/src/freenet/client/
trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
Log:
backport r25931 - Don't freeData() in onSuccess/onFailure for inserts - it may
get re-added
Property changes on: trunk/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714
+ /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714,25931
Property changes on: trunk/freenet/src/freenet/client
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714
/branches/db4o/src/freenet/client:25594
+
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355-25356,25479,25488,25505,25540,25594,25673,25713-25714,25931
/branches/db4o/src/freenet/client:25594
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutBase.java 2009-03-09
06:57:05 UTC (rev 25973)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutBase.java 2009-03-09
11:40:21 UTC (rev 25974)
@@ -139,6 +139,8 @@
succeeded = true;
finished = true;
}
+ // Could restart, and is on the putter, don't free data until
we remove the putter
+ //freeData();
freeData();
finish();
trySendFinalMessage(null);
@@ -153,7 +155,8 @@
finished = true;
putFailedMessage = new PutFailedMessage(e, identifier,
global);
}
- freeData();
+ // Could restart, and is on the putter, don't free data until
we remove the putter
+ //freeData();
finish();
trySendFinalMessage(null);
client.notifyFailure(this);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
