[freenet-cvs] r9075 - in trunk/freenet/src/freenet: client/async node

[t...@freenetproject.org]

Author: toad
Date: 2006-06-07 23:14:08 +0000 (Wed, 07 Jun 2006)
New Revision: 9075

Modified:
   trunk/freenet/src/freenet/client/async/USKChecker.java
   trunk/freenet/src/freenet/client/async/USKFetcher.java
   trunk/freenet/src/freenet/node/Version.java
Log:
785: Fix background polling USK fetchers. Maybe this fixes updating?

Modified: trunk/freenet/src/freenet/client/async/USKChecker.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKChecker.java      2006-06-07 
20:31:48 UTC (rev 9074)
+++ trunk/freenet/src/freenet/client/async/USKChecker.java      2006-06-07 
23:14:08 UTC (rev 9075)
@@ -4,7 +4,6 @@
 import freenet.keys.ClientKey;
 import freenet.keys.ClientKeyBlock;
 import freenet.keys.ClientSSKBlock;
-import freenet.keys.SSKBlock;
 import freenet.node.LowLevelGetException;
 import freenet.support.Logger;


Modified: trunk/freenet/src/freenet/client/async/USKFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcher.java      2006-06-07 
20:31:48 UTC (rev 9074)
+++ trunk/freenet/src/freenet/client/async/USKFetcher.java      2006-06-07 
23:14:08 UTC (rev 9075)
@@ -208,7 +208,6 @@
                                Logger.minor(this, "latest: "+curLatest+", last 
fetched: "+lastFetchedEdition+", curLatest+MIN_FAILURES: 
"+(curLatest+minFailures));
                                if(started) {
                                        finished = true;
-                                       completed = true;
                                }
                        } else 
                                Logger.minor(this, "Remaining: 
"+runningAttempts.size());
@@ -271,12 +270,12 @@
        void onSuccess(USKAttempt att, boolean dontUpdate, ClientSSKBlock 
block) {
                LinkedList l = null;
                synchronized(this) {
-                       if(completed || cancelled) return;
                        runningAttempts.remove(att);
                        long curLatest = att.number;
+                       long lastEd = uskManager.lookup(origUSK);
                        if(!dontUpdate)
                                uskManager.update(origUSK, curLatest);
-                       long lastEd = uskManager.lookup(origUSK);
+                       if(completed || cancelled) return;
                        if(curLatest >= lastEd) {
                                try {
                                        this.lastRequestData = 
block.decode(ctx.bucketFactory, 1025 /* it's an SSK */, true);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-07 20:31:48 UTC (rev 
9074)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-07 23:14:08 UTC (rev 
9075)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 784;
+       private static final int buildNumber = 785;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 765;