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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-17 19:06:29 +0000 (Tue, 17 Jun 2008)
New Revision: 20417

Modified:
   branches/db4o/freenet/src/freenet/client/async/USKManager.java
   branches/db4o/freenet/src/freenet/client/async/USKRetriever.java
Log:
Remove unnecessary references to CRS's.

Modified: branches/db4o/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKManager.java      
2008-06-17 19:04:51 UTC (rev 20416)
+++ branches/db4o/freenet/src/freenet/client/async/USKManager.java      
2008-06-17 19:06:29 UTC (rev 20417)
@@ -40,8 +40,6 @@
        final HashMap checkersByUSK;

        final FetchContext backgroundFetchContext;
-       final ClientRequestScheduler chkRequestScheduler;
-       final ClientRequestScheduler sskRequestScheduler;

        final Ticker ticker;

@@ -50,8 +48,6 @@
                backgroundFetchContext = 
core.makeClient(RequestStarter.UPDATE_PRIORITY_CLASS).getFetchContext();
                backgroundFetchContext.followRedirects = false;
                backgroundFetchContext.uskManager = this;
-               this.chkRequestScheduler = 
core.requestStarters.chkFetchScheduler;
-               this.sskRequestScheduler = 
core.requestStarters.sskFetchScheduler;
                latestVersionByClearUSK = new HashMap();
                subscribersByClearUSK = new HashMap();
                fetchersByUSK = new HashMap();
@@ -194,7 +190,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);
+                                       f = new USKFetcher(origUSK, this, 
backgroundFetchContext, new USKFetcherWrapper(origUSK, 
RequestStarter.UPDATE_PRIORITY_CLASS, client), 10, true, false);
                                        sched = f;
                                        backgroundFetchersByClearUSK.put(clear, 
f);
                                }
@@ -269,7 +265,7 @@
         * @return
         */
        public USKRetriever subscribeContent(USK origUSK, USKRetrieverCallback 
cb, boolean runBackgroundFetch, FetchContext fctx, short prio, RequestClient 
client) {
-               USKRetriever ret = new USKRetriever(fctx, prio, 
chkRequestScheduler, sskRequestScheduler, client, cb);
+               USKRetriever ret = new USKRetriever(fctx, prio, client, cb);
                subscribe(origUSK, ret, runBackgroundFetch, client);
                return ret;
        }

Modified: branches/db4o/freenet/src/freenet/client/async/USKRetriever.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKRetriever.java    
2008-06-17 19:04:51 UTC (rev 20416)
+++ branches/db4o/freenet/src/freenet/client/async/USKRetriever.java    
2008-06-17 19:06:29 UTC (rev 20417)
@@ -24,9 +24,9 @@
        final FetchContext ctx;
        final USKRetrieverCallback cb;

-       public USKRetriever(FetchContext fctx, short prio, 
ClientRequestScheduler chkSched, 
-                       ClientRequestScheduler sskSched, RequestClient client, 
USKRetrieverCallback cb) {
-               super(prio, chkSched, sskSched, client);
+       public USKRetriever(FetchContext fctx, short prio,  
+                       RequestClient client, USKRetrieverCallback cb) {
+               super(prio, client);
                this.ctx = fctx;
                this.cb = cb;
        }