Author: toad
Date: 2008-12-19 20:39:10 +0000 (Fri, 19 Dec 2008)
New Revision: 24648

Modified:
   branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
Clear the main metadata when setting the archiveMetadata.


Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java       
2008-12-19 20:34:46 UTC (rev 24647)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java       
2008-12-19 20:39:10 UTC (rev 24648)
@@ -345,6 +345,7 @@
                                        ah = 
context.archiveManager.makeHandler(thisKey, metadata.getArchiveType(), 
metadata.getCompressionCodec(),
                                                        (parent instanceof 
ClientGetter ? ((ClientGetter)parent).collectingBinaryBlob() : false), 
persistent);
                                archiveMetadata = metadata;
+                               metadata = null;
                                // ah is set. This means we are currently 
handling an archive.
                                Bucket metadataBucket;
                                metadataBucket = ah.getMetadata(actx, null, 
recursionLevel+1, true, context.archiveManager);
@@ -400,7 +401,6 @@
                                                }
                                        }, container, context); // will result 
in this function being called again
                                        if(persistent) container.store(this);
-                                       metadata = null;
                                        return;
                                }
                                continue;

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to