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

[t...@freenetproject.org]

Author: toad
Date: 2008-10-10 12:47:18 +0000 (Fri, 10 Oct 2008)
New Revision: 22978

Modified:
   branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Activation etc


Modified: 
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-10-09 13:10:16 UTC (rev 22977)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-10-10 12:47:18 UTC (rev 22978)
@@ -499,8 +499,10 @@
                        if(hasResolvedBase) return;
                        hasResolvedBase = true;
                }
-               if(persistent())
+               if(persistent()) {
                        container.store(this);
+                       container.activate(elementsToPutInZip, 2);
+               }
                InsertBlock block;
                boolean isMetadata = true;
                boolean insertAsArchiveManifest = false;
@@ -519,9 +521,6 @@
                                ZipOutputStream zos = new ZipOutputStream(os);
                                ZipEntry ze;

-                               if(persistent()) {
-                                       container.activate(elementsToPutInZip, 
2);
-                               }
                                for(Iterator 
i=elementsToPutInZip.iterator();i.hasNext();) {
                                        PutHandler ph = (PutHandler) i.next();
                                        ze = new ZipEntry(ph.targetInZip);
@@ -571,11 +570,11 @@
                        }
                        this.metadataPuttersByMetadata.put(baseMetadata, 
metadataInserter);
                        metadataPuttersUnfetchable.put(baseMetadata, 
metadataInserter);
-                       metadataInserter.start(null, container, context);
                        if(persistent()) {
                                container.store(metadataPuttersByMetadata);
                                container.store(metadataPuttersUnfetchable);
                        }
+                       metadataInserter.start(null, container, context);
                } catch (InsertException e) {
                        fail(e, container);
                }