Author: toad
Date: 2008-12-13 15:58:55 +0000 (Sat, 13 Dec 2008)
New Revision: 24294
Modified:
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
Fix logic for when to restart the ext fetcher. requiredExt must be set.
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2008-12-13
15:57:31 UTC (rev 24293)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2008-12-13
15:58:55 UTC (rev 24294)
@@ -474,15 +474,14 @@
synchronized(this) {
if(recommendedExt > -1) {
maxDeployVersion = recommendedExt;
- if(realAvailableVersion != availableVersion &&
realAvailableVersion <= recommendedExt) {
- // We found a revision but didn't fetch
it because it was after the old range.
- System.err.println("Have found edition
"+realAvailableVersion+" but ignored it because out of range, fetching as
required by new jar");
- callFinishedFound = availableVersion =
realAvailableVersion;
- }
}
if(requiredExt > -1) {
minDeployVersion = requiredExt;
- if(callFinishedFound == -1 && availableVersion
< requiredExt) { // Including if it hasn't been found at all
+ if(realAvailableVersion != availableVersion &&
availableVersion < requiredExt && realAvailableVersion >= requiredExt) {
+ // We found a revision but didn't fetch
it because it was after the old range.
+ System.err.println("Have found edition
"+realAvailableVersion+" but ignored it because out of range, fetching as
required by new jar");
+ callFinishedFound = availableVersion =
realAvailableVersion;
+ } else if(availableVersion < requiredExt) { //
Including if it hasn't been found at all
// Just try it ...
callFinishedFound = availableVersion =
requiredExt;
System.err.println("Need minimum
edition "+requiredExt+" for new jar, fetching...");
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
