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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-13 18:32:49 +0000 (Fri, 13 Jun 2008)
New Revision: 20323

Modified:
   branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
Pass in ArchiveManager

Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java       
2008-06-13 18:31:42 UTC (rev 20322)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java       
2008-06-13 18:32:49 UTC (rev 20323)
@@ -275,7 +275,7 @@
                                archiveMetadata = metadata;
                                // ah is set. This means we are currently 
handling an archive.
                                Bucket metadataBucket;
-                               metadataBucket = ah.getMetadata(actx, null, 
recursionLevel+1, true);
+                               metadataBucket = ah.getMetadata(actx, null, 
recursionLevel+1, true, context.archiveManager);
                                if(metadataBucket != null) {
                                        try {
                                                metadata = 
Metadata.construct(metadataBucket);
@@ -320,7 +320,7 @@
                                        throw new 
FetchException(FetchException.UNKNOWN_METADATA, "Archive redirect not in an 
archive manifest");
                                String filename = metadata.getZIPInternalName();
                                if(logMINOR) Logger.minor(this, "Fetching 
"+filename);
-                               Bucket dataBucket = ah.get(filename, actx, 
null, recursionLevel+1, true);
+                               Bucket dataBucket = ah.get(filename, actx, 
null, recursionLevel+1, true, context.archiveManager);
                                if(dataBucket != null) {
                                        if(logMINOR) Logger.minor(this, 
"Returning data");
                                        final Bucket out;
@@ -598,7 +598,7 @@

                public void onSuccess(FetchResult result, ClientGetState state, 
ObjectContainer container, ClientContext context) {
                        try {
-                               ah.extractToCache(result.asBucket(), actx, 
element, callback);
+                               ah.extractToCache(result.asBucket(), actx, 
element, callback, context.archiveManager);
                        } catch (ArchiveFailureException e) {
                                SingleFileFetcher.this.onFailure(new 
FetchException(e), false, sched, container, context);
                                return;