Author: toad
Date: 2008-12-19 19:58:15 +0000 (Fri, 19 Dec 2008)
New Revision: 24640
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
branches/db4o/freenet/src/freenet/client/async/USKRetriever.java
Log:
Remove useless argument
Modified: branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2008-12-19 19:54:58 UTC (rev 24639)
+++ branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2008-12-19 19:58:15 UTC (rev 24640)
@@ -97,7 +97,7 @@
cancelled = false;
finished = false;
}
- currentState = SingleFileFetcher.create(this,
this, new ClientMetadata(),
+ currentState = SingleFileFetcher.create(this,
this,
uri, ctx, actx,
ctx.maxNonSplitfileRetries, 0, false, -1, true,
returnBucket, true, container,
context);
}
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-12-19 19:54:58 UTC (rev 24639)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-12-19 19:58:15 UTC (rev 24640)
@@ -945,18 +945,18 @@
* Create a fetcher for a key.
*/
public static ClientGetState create(ClientRequester requester,
GetCompletionCallback cb,
- ClientMetadata clientMetadata, FreenetURI uri,
FetchContext ctx, ArchiveContext actx,
+ FreenetURI uri, FetchContext ctx, ArchiveContext actx,
int maxRetries, int recursionLevel, boolean
dontTellClientGet, long l, boolean isEssential,
Bucket returnBucket, boolean isFinal, ObjectContainer
container, ClientContext context) throws MalformedURLException, FetchException {
BaseClientKey key = BaseClientKey.getBaseKey(uri);
- if((clientMetadata == null || clientMetadata.isTrivial()) &&
(!uri.hasMetaStrings()) &&
+ if((!uri.hasMetaStrings()) &&
ctx.allowSplitfiles == false &&
ctx.followRedirects == false &&
returnBucket == null && key instanceof
ClientKey)
return new SimpleSingleFileFetcher((ClientKey)key,
maxRetries, ctx, requester, cb, isEssential, false, l, container, context);
if(key instanceof ClientKey)
- return new SingleFileFetcher(requester, cb,
clientMetadata, (ClientKey)key, new ArrayList<String>(uri.listMetaStrings()),
uri, 0, ctx, actx, null, null, maxRetries, recursionLevel, dontTellClientGet,
l, isEssential, returnBucket, isFinal, container, context);
+ return new SingleFileFetcher(requester, cb, new
ClientMetadata(), (ClientKey)key, new ArrayList<String>(uri.listMetaStrings()),
uri, 0, ctx, actx, null, null, maxRetries, recursionLevel, dontTellClientGet,
l, isEssential, returnBucket, isFinal, container, context);
else {
- return uskCreate(requester, cb, clientMetadata,
(USK)key, new ArrayList<String>(uri.listMetaStrings()), ctx, actx, maxRetries,
recursionLevel, dontTellClientGet, l, isEssential, returnBucket, isFinal,
container, context);
+ return uskCreate(requester, cb, new ClientMetadata(),
(USK)key, new ArrayList<String>(uri.listMetaStrings()), ctx, actx, maxRetries,
recursionLevel, dontTellClientGet, l, isEssential, returnBucket, isFinal,
container, context);
}
}
Modified: branches/db4o/freenet/src/freenet/client/async/USKRetriever.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKRetriever.java
2008-12-19 19:54:58 UTC (rev 24639)
+++ branches/db4o/freenet/src/freenet/client/async/USKRetriever.java
2008-12-19 19:58:15 UTC (rev 24640)
@@ -46,7 +46,7 @@
FreenetURI uri = key.getSSK(l).getURI();
try {
SingleFileFetcher getter =
- (SingleFileFetcher)
SingleFileFetcher.create(this, this, new ClientMetadata(), uri, ctx, new
ArchiveContext(ctx.maxTempLength, ctx.maxArchiveLevels),
+ (SingleFileFetcher)
SingleFileFetcher.create(this, this, uri, ctx, new
ArchiveContext(ctx.maxTempLength, ctx.maxArchiveLevels),
ctx.maxNonSplitfileRetries, 0,
true, l, true, null, false, null, context);
getter.schedule(null, context);
} catch (MalformedURLException e) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
