Author: toad
Date: 2007-06-13 15:37:17 +0000 (Wed, 13 Jun 2007)
New Revision: 13559
Modified:
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
Log:
Another UOM fix: use the downloaded version from UOM, not the version we
expected.
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2007-06-13
15:18:19 UTC (rev 13558)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2007-06-13
15:37:17 UTC (rev 13559)
@@ -177,10 +177,10 @@
}
public void onSuccess(FetchResult result, ClientGetter state) {
- onSuccess(result, state, tempBlobFile);
+ onSuccess(result, state, tempBlobFile, fetchingVersion);
}
- void onSuccess(FetchResult result, ClientGetter state, File
tempBlobFile) {
+ void onSuccess(FetchResult result, ClientGetter state, File
tempBlobFile, int fetchedVersion) {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
boolean isNew;
synchronized(this) {
@@ -203,7 +203,7 @@
Logger.error(this, "Not able to rename
binary blob for node updater: "+tempBlobFile+" -> "+blobFile+" - may not be
able to tell other peers about this build");
}
}
- this.fetchedVersion = fetchingVersion;
+ this.fetchedVersion = fetchedVersion;
if(fetchedVersion > currentVersion) {
System.out.println("Found "+fetchingVersion);
Logger.normal(this, "Found a new version! (" +
fetchingVersion + ", setting up a new UpdatedVersionAvailableUserAlert");
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2007-06-13 15:18:19 UTC (rev 13558)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2007-06-13 15:37:17 UTC (rev 13559)
@@ -1133,7 +1133,7 @@
System.err.println("Not updating
because updater is disabled!");
return;
}
- mainUpdater.onSuccess(result, state,
cleanedBlobFile);
+ mainUpdater.onSuccess(result, state,
cleanedBlobFile, version);
temp.delete();
insertBlob(mainUpdater.getBlobFile(version));
}
