Author: toad
Date: 2008-08-22 22:40:39 +0000 (Fri, 22 Aug 2008)
New Revision: 22108
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Merge 22086
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-08-22 22:12:24 UTC (rev 22107)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-08-22 22:40:39 UTC (rev 22108)
@@ -74,7 +74,8 @@
private final boolean persistent;
public void start(ObjectContainer container, ClientContext
context) throws InsertException {
- if((origSFI == null) && (metadata != null)) return;
+ if((origSFI == null) || (metadata != null))
+ return;
if(persistent)
container.activate(origSFI, 1);
origSFI.start(null, container, context);