Author: toad
Date: 2008-08-06 22:29:22 +0000 (Wed, 06 Aug 2008)
New Revision: 21650
Modified:
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Maybe fix "The update process seems to have been stuck for over an hour; let's
switch to UoM! SHOULD NOT HAPPEN! (2)"
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-08-06 22:11:56 UTC (rev 21649)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-08-06 22:29:22 UTC (rev 21650)
@@ -211,8 +211,9 @@
long now = System.currentTimeMillis();
long started =
updateManager.getStartedFetchingNextMainJarTimestamp();
- long whenToTakeOverTheNormalUpdater = -1;
+ long whenToTakeOverTheNormalUpdater;
if(started > 0) whenToTakeOverTheNormalUpdater = started +
GRACE_TIME;
+ else whenToTakeOverTheNormalUpdater =
System.currentTimeMillis() + GRACE_TIME;
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)+")
file length "+mainJarFileLength+" updateManager version
"+updateManager.newMainJarVersion());
@@ -221,7 +222,7 @@
source.setMainJarOfferedVersion(mainJarVersion);
// Offer is valid.
if(logMINOR) Logger.minor(this, "Offer is valid");
- if((isOutdated) || (whenToTakeOverTheNormalUpdater > 0
&& whenToTakeOverTheNormalUpdater < now)) {
+ if((isOutdated) || whenToTakeOverTheNormalUpdater <
now) {
// Take up the offer, subject to limits on
number of simultaneous downloads.
// If we have fetches running already, then
sendUOMRequestMain() will add the offer to nodesOfferedMainJar,
// so that if all our fetches fail, we can
fetch from this node.
