Author: toad
Date: 2008-12-19 20:02:38 +0000 (Fri, 19 Dec 2008)
New Revision: 24642
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
And another one.
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-12-19 20:01:09 UTC (rev 24641)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-12-19 20:02:38 UTC (rev 24642)
@@ -991,7 +991,7 @@
// Do a thorough, blocking search
USKFetcherTag tag =
context.uskManager.getFetcher(usk.copy(-usk.suggestedEdition), ctx, false,
requester.persistent(),
- new
MyUSKFetcherCallback(requester, cb, new ClientMetadata(), usk, metaStrings,
ctx, actx, maxRetries, recursionLevel, dontTellClientGet, l, returnBucket,
requester.persistent()), container, context);
+ new
MyUSKFetcherCallback(requester, cb, usk, metaStrings, ctx, actx, maxRetries,
recursionLevel, dontTellClientGet, l, returnBucket, requester.persistent()),
container, context);
if(isEssential)
requester.addMustSucceedBlocks(1, container);
return tag;
@@ -1002,7 +1002,6 @@
final ClientRequester parent;
final GetCompletionCallback cb;
- final ClientMetadata clientMetadata;
final USK usk;
final ArrayList<String> metaStrings;
final FetchContext ctx;
@@ -1014,10 +1013,9 @@
final Bucket returnBucket;
final boolean persistent;
- public MyUSKFetcherCallback(ClientRequester requester,
GetCompletionCallback cb, ClientMetadata clientMetadata, USK usk,
ArrayList<String> metaStrings, FetchContext ctx, ArchiveContext actx, int
maxRetries, int recursionLevel, boolean dontTellClientGet, long l, Bucket
returnBucket, boolean persistent) {
+ public MyUSKFetcherCallback(ClientRequester requester,
GetCompletionCallback cb, USK usk, ArrayList<String> metaStrings, FetchContext
ctx, ArchiveContext actx, int maxRetries, int recursionLevel, boolean
dontTellClientGet, long l, Bucket returnBucket, boolean persistent) {
this.parent = requester;
this.cb = cb;
- this.clientMetadata = clientMetadata;
this.usk = usk;
this.metaStrings = metaStrings;
this.ctx = ctx;
@@ -1036,7 +1034,7 @@
ClientSSK key = usk.getSSK(l);
try {
if(l == usk.suggestedEdition) {
- SingleFileFetcher sf = new
SingleFileFetcher(parent, cb, clientMetadata, key, metaStrings,
key.getURI().addMetaStrings(metaStrings),
+ SingleFileFetcher sf = new
SingleFileFetcher(parent, cb, new ClientMetadata(), key, metaStrings,
key.getURI().addMetaStrings(metaStrings),
0, ctx, actx, null,
null, maxRetries, recursionLevel+1, dontTellClientGet, token, false,
returnBucket, true, container, context);
sf.schedule(container, context);
} else {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
