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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-09 17:15:14 +0000 (Sat, 09 Jun 2007)
New Revision: 13499

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
Updater: Fetch the current version if nothing else. (Don't update to it)
Useful for update over mandatory.

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2007-06-09 
17:12:22 UTC (rev 13498)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2007-06-09 
17:15:14 UTC (rev 13499)
@@ -69,8 +69,8 @@

        void start() {
                try{
-                       // start at next version, not interested in this version
-                       USK 
myUsk=USK.create(URI.setSuggestedEdition(currentVersion+1));
+                       // because of UoM, this version is actually worth 
having as well
+                       USK 
myUsk=USK.create(URI.setSuggestedEdition(currentVersion));
                        ctx.uskManager.subscribe(myUsk, this, true, this);
                }catch(MalformedURLException e){
                        Logger.error(this,"The auto-update URI isn't valid and 
can't be used");
@@ -176,11 +176,14 @@
                                return;
                        }
                        this.fetchedVersion = fetchingVersion;
-                       System.out.println("Found "+fetchingVersion);
-                       Logger.normal(this, "Found a new version! (" + 
fetchingVersion + ", setting up a new UpdatedVersionAvailableUserAlert");
+                       if(fetchedVersion > currentVersion) {
+                               System.out.println("Found "+fetchingVersion);
+                               Logger.normal(this, "Found a new version! (" + 
fetchingVersion + ", setting up a new UpdatedVersionAvailableUserAlert");
+                       }
                        this.cg = null;
                        if(this.result != null) this.result.asBucket().free();
                        this.result = result;
+                       if(fetchedVersion <= currentVersion) return;
                }
                manager.onDownloadedNewJar(extUpdate);
        }