Author: j16sdiz
Date: 2009-02-23 08:44:14 +0000 (Mon, 23 Feb 2009)
New Revision: 25764
Modified:
trunk/freenet/src/freenet/client/
trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Backport r25353 from db4o, maybe related to bug 2486
Property changes on: trunk/freenet/src/freenet/client
___________________________________________________________________
Added: svn:mergeinfo
+
/branches/db4o/freenet/src/freenet/client:24785,25282,25332,25353,25479,25488,25540,25594
/branches/db4o/src/freenet/client:25594
Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-02-22 11:23:02 UTC (rev 25763)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-02-23 08:44:14 UTC (rev 25764)
@@ -414,7 +414,10 @@
return;
} catch (MetadataUnresolvedException e) {
try {
+ // Start the insert for the
sub-Metadata.
+ // Eventually it will generate a URI
and call onEncode(), which will call back here.
resolve(e);
+ return;
} catch (IOException e1) {
fail(new
InsertException(InsertException.BUCKET_ERROR, e, null));
return;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
