[freenet-cvs] r11856 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2007-02-20 18:40:39 +0000 (Tue, 20 Feb 2007)
New Revision: 11856

Modified:
   trunk/freenet/src/freenet/client/async/USKFetcher.java
   trunk/freenet/src/freenet/client/async/USKManager.java
Log:
Token not used on USKFetcher

Modified: trunk/freenet/src/freenet/client/async/USKFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcher.java      2007-02-20 
18:04:53 UTC (rev 11855)
+++ trunk/freenet/src/freenet/client/async/USKFetcher.java      2007-02-20 
18:40:39 UTC (rev 11856)
@@ -198,14 +198,12 @@

        private boolean started;

-       private int token;
-       
-       USKFetcher(USK origUSK, USKManager manager, FetchContext ctx, 
ClientRequester requester, int minFailures, boolean pollForever, boolean 
keepLastData, int token) {
-               this(origUSK, manager, ctx, requester, minFailures, 
pollForever, DEFAULT_MAX_MIN_FAILURES, keepLastData, token);
+       USKFetcher(USK origUSK, USKManager manager, FetchContext ctx, 
ClientRequester requester, int minFailures, boolean pollForever, boolean 
keepLastData) {
+               this(origUSK, manager, ctx, requester, minFailures, 
pollForever, DEFAULT_MAX_MIN_FAILURES, keepLastData);
        }

        // FIXME use this!
-       USKFetcher(USK origUSK, USKManager manager, FetchContext ctx, 
ClientRequester requester, int minFailures, boolean pollForever, long 
maxProbeEditions, boolean keepLastData, int token) {
+       USKFetcher(USK origUSK, USKManager manager, FetchContext ctx, 
ClientRequester requester, int minFailures, boolean pollForever, long 
maxProbeEditions, boolean keepLastData) {
                this.parent = requester;
                this.maxMinFailures = maxProbeEditions;
                this.origUSK = origUSK;
@@ -220,7 +218,6 @@
                this.backgroundPoll = pollForever;
                this.keepLastData = keepLastData;
                logMINOR = Logger.shouldLog(Logger.MINOR, this);
-               this.token = token;
        }

        void onDNF(USKAttempt att) {
@@ -518,7 +515,7 @@
        }

        public long getToken() {
-               return token;
+               return -1;
        }

 }

Modified: trunk/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKManager.java      2007-02-20 
18:04:53 UTC (rev 11855)
+++ trunk/freenet/src/freenet/client/async/USKManager.java      2007-02-20 
18:40:39 UTC (rev 11856)
@@ -89,14 +89,14 @@
                        if((f.parent.priorityClass == requester.priorityClass) 
&& f.ctx.equals(ctx) && f.keepLastData == keepLastData)
                                return f;
                }
-               f = new USKFetcher(usk, this, ctx, requester, 3, false, 
keepLastData, -1);
+               f = new USKFetcher(usk, this, ctx, requester, 3, false, 
keepLastData);
                fetchersByUSK.put(usk, f);
                return f;
        }

        public USKFetcher getFetcherForInsertDontSchedule(USK usk, short 
prioClass, USKFetcherCallback cb, Object client) {
                USKFetcher f = new USKFetcher(usk, this, 
backgroundFetchContext, 
-                               new USKFetcherWrapper(usk, prioClass, 
chkRequestScheduler, sskRequestScheduler, client), 3, false, true, -1);
+                               new USKFetcherWrapper(usk, prioClass, 
chkRequestScheduler, sskRequestScheduler, client), 3, false, true);
                f.addCallback(cb);
                return f;
        }
@@ -107,7 +107,7 @@
                synchronized(this) {
                        USKFetcher f = (USKFetcher) 
backgroundFetchersByClearUSK.get(clear);
                        if(f == null) {
-                               f = new USKFetcher(usk, this, 
backgroundFetchContext, new USKFetcherWrapper(usk, 
RequestStarter.UPDATE_PRIORITY_CLASS, chkRequestScheduler, sskRequestScheduler, 
this), 10, true, false, -1);
+                               f = new USKFetcher(usk, this, 
backgroundFetchContext, new USKFetcherWrapper(usk, 
RequestStarter.UPDATE_PRIORITY_CLASS, chkRequestScheduler, sskRequestScheduler, 
this), 10, true, false);
                                sched = f;
                                backgroundFetchersByClearUSK.put(clear, f);
                        }
@@ -181,7 +181,7 @@
                        if(runBackgroundFetch) {
                                USKFetcher f = (USKFetcher) 
backgroundFetchersByClearUSK.get(clear);
                                if(f == null) {
-                                       f = new USKFetcher(origUSK, this, 
backgroundFetchContext, new USKFetcherWrapper(origUSK, 
RequestStarter.UPDATE_PRIORITY_CLASS, chkRequestScheduler, sskRequestScheduler, 
client), 10, true, false, -1);
+                                       f = new USKFetcher(origUSK, this, 
backgroundFetchContext, new USKFetcherWrapper(origUSK, 
RequestStarter.UPDATE_PRIORITY_CLASS, chkRequestScheduler, sskRequestScheduler, 
client), 10, true, false);
                                        sched = f;
                                        backgroundFetchersByClearUSK.put(clear, 
f);
                                }