Author: toad
Date: 2008-08-02 19:32:39 +0000 (Sat, 02 Aug 2008)
New Revision: 21581
Modified:
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Re-check isOutdated, as per nextgens' suggestion
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-08-02 07:22:58 UTC (rev 21580)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-08-02 19:32:39 UTC (rev 21581)
@@ -211,7 +211,7 @@
long now = System.currentTimeMillis();
long whenToTakeOverTheNormalUpdater =
updateManager.getStartedFetchingNextMainJarTimestamp() + GRACE_TIME;
- final boolean isOutdated = updateManager.node.isOudated();
+ boolean isOutdated = updateManager.node.isOudated();
// if the new build is self-mandatory or if the "normal"
updater has been trying to update for more than one hour
Logger.normal(this, "We received a valid UOMAnnounce :
(isOutdated="+isOutdated+" version="+mainJarVersion +"
whenToTakeOverTheNormalUpdater="+TimeUtil.formatTime(whenToTakeOverTheNormalUpdater-now)+')');
if(mainJarVersion > Version.buildNumber() && mainJarFileLength
> 0 &&
@@ -249,7 +249,7 @@
if(updateManager.isBlown())
return;
if(!updateManager.isEnabled())
return;
if(updateManager.hasNewMainJar()) return;
- if(!isOutdated) {
+
if(!updateManager.node.isOudated()) {
Logger.error(this, "The
update process seems to have been stuck for over an hour; let's switch to UoM!
SHOULD NOT HAPPEN!");
System.out.println("The
update process seems to have been stuck for over an hour; let's switch to UoM!
SHOULD NOT HAPPEN!");
}