[freenet-cvs] r22109 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-08-22 22:42:04 +0000 (Fri, 22 Aug 2008)
New Revision: 22109

Modified:
   branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Merge 22096 from trunk


Modified: 
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-08-22 22:40:39 UTC (rev 22108)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-08-22 22:42:04 UTC (rev 22109)
@@ -74,8 +74,14 @@
                private final boolean persistent;

                public void start(ObjectContainer container, ClientContext 
context) throws InsertException {
-                       if((origSFI == null) || (metadata != null))
+                       if (origSFI == null) {
+                                Logger.error(this, "origSFI is null on 
start(), should be impossible", new Exception("debug"));
+                                return;
+                       }
+                       if (metadata != null) {
+                               Logger.error(this, "metdata=" + metadata + " on 
start(), should be impossible", new Exception("debug"));
                                return;
+                       }
                        if(persistent)
                                container.activate(origSFI, 1);
                        origSFI.start(null, container, context);