[freenet-cvs] r10933 - trunk/freenet/src/freenet/node/updater

[t...@freenetproject.org]

Author: toad
Date: 2006-11-15 17:59:17 +0000 (Wed, 15 Nov 2006)
New Revision: 10933

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
Fix updater: Wouldn't fetch a new version if had once fetched the old version.

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-11-15 
17:49:45 UTC (rev 10932)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-11-15 
17:59:17 UTC (rev 10933)
@@ -162,6 +162,7 @@
                        try{
                                if((cg==null)||cg.isCancelled()){
                                        if(logMINOR) Logger.minor(this, 
"Scheduling request for "+URI.setSuggestedEdition(availableVersion));
+                                       System.err.println("Starting fetch for 
"+availableVersion);
                                        cg = new ClientGetter(this, 
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler, 
                                                        
URI.setSuggestedEdition(availableVersion), ctx, 
RequestStarter.UPDATE_PRIORITY_CLASS, 
                                                        this, new 
ArrayBucket());
@@ -315,7 +316,7 @@
                        return;
                }

-               System.out.println("################## New jar written! 
"+cg.getURI().getSuggestedEdition()+ " " +fNew.getAbsolutePath());
+               System.out.println("################## New jar written! 
"+fetchedVersion+ " " +fNew.getAbsolutePath());

                if(!nastyRestart) {
                        // Easy way.
@@ -429,7 +430,7 @@
                        Logger.normal(this, "Found a new version! (" + 
fetchingVersion + ", setting up a new UpdatedVersionAvailableUserAlert");
                        alert.set(availableVersion,fetchingVersion,true);
                        alert.isValid(true);
-                       this.cg = state;
+                       this.cg = null;
                        if(this.result != null) this.result.asBucket().free();
                        this.result = result;
                        if(this.isAutoUpdateAllowed) {
@@ -470,7 +471,7 @@
                if(!state.getURI().equals(revocationURI)){
                        if(logMINOR) Logger.minor(this, 
"onFailure("+e+","+state+")");
                        synchronized(this) {
-                               this.cg = state;
+                               this.cg = null;
                                isFetching=false;
                        }
                        state.cancel();