Author: toad
Date: 2008-12-19 20:07:27 +0000 (Fri, 19 Dec 2008)
New Revision: 24645
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
Log:
May as well pass in null
Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-12-19 20:06:27 UTC (rev 24644)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileFetcher.java
2008-12-19 20:07:27 UTC (rev 24645)
@@ -954,7 +954,7 @@
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, new
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, null,
(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, (USK)key, new
ArrayList<String>(uri.listMetaStrings()), ctx, actx, maxRetries,
recursionLevel, dontTellClientGet, l, isEssential, returnBucket, isFinal,
container, context);
}
@@ -978,7 +978,7 @@
new
USKProxyCompletionCallback(usk, cb, requester.persistent());
// Want to update the latest known good
iff the fetch succeeds.
SingleFileFetcher sf =
- new
SingleFileFetcher(requester, myCB, new ClientMetadata(), usk.getSSK(),
metaStrings,
+ new
SingleFileFetcher(requester, myCB, null, usk.getSSK(), metaStrings,
usk.getURI().addMetaStrings(metaStrings), 0, ctx, actx, null, null, maxRetries,
recursionLevel,
dontTellClientGet, l, isEssential, returnBucket, isFinal, container, context);
return sf;
@@ -1034,7 +1034,7 @@
ClientSSK key = usk.getSSK(l);
try {
if(l == usk.suggestedEdition) {
- SingleFileFetcher sf = new
SingleFileFetcher(parent, cb, new ClientMetadata(), key, metaStrings,
key.getURI().addMetaStrings(metaStrings),
+ SingleFileFetcher sf = new
SingleFileFetcher(parent, cb, null, 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
