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

[t...@freenetproject.org]

Author: toad
Date: 2007-09-07 13:34:39 +0000 (Fri, 07 Sep 2007)
New Revision: 14994

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
Log:
Use NodeStarter.extBuildNumber() not ExtVersion.buildNumber. This is likely to 
be more accurate and may fix the failure to update the ext.jar.
Also logging.

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java       
2007-09-06 23:22:45 UTC (rev 14993)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java       
2007-09-07 13:34:39 UTC (rev 14994)
@@ -594,16 +594,20 @@
        void onDownloadedNewJar(boolean isExt) {
                synchronized(this) {
                        if(isExt) {
-                               if(extUpdater.getFetchedVersion() > 
ExtVersion.buildNumber) {
+                               if(extUpdater.getFetchedVersion() > 
NodeStarter.extBuildNumber) {
                                        hasNewExtJar = true;
                                        startedFetchingNextExtJar = -1;
                                        gotJarTime = System.currentTimeMillis();
+                                       if(logMINOR)
+                                               Logger.minor(this, "Got ext 
jar: "+extUpdater.getFetchedVersion());
                                }
                        } else {
                                if(mainUpdater.getFetchedVersion() > 
Version.buildNumber()) {
                                        hasNewMainJar = true;
                                        startedFetchingNextMainJar = -1;
                                        gotJarTime = System.currentTimeMillis();
+                                       if(logMINOR)
+                                               Logger.minor(this, "Got main 
jar: "+mainUpdater.getFetchedVersion());
                                }
                        }
                }