Author: toad
Date: 2006-08-17 13:49:42 +0000 (Thu, 17 Aug 2006)
New Revision: 10159
Modified:
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
Log:
More update fixes.
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-08-17
13:28:38 UTC (rev 10158)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-08-17
13:49:42 UTC (rev 10159)
@@ -151,7 +151,7 @@
fetchingVersion = availableVersion;
- alert.set(availableVersion,fetchingVersion,false);
+ alert.set(availableVersion,fetchingVersion,result !=
null && result.asBucket() != null && result.asBucket().size() > 0);
alert.isValid(true);
Logger.normal(this,"Starting the update process
("+availableVersion+")");
System.err.println("Starting the update process: found
the update ("+availableVersion+"), now fetching it.");
@@ -409,6 +409,11 @@
public synchronized void onSuccess(FetchResult result, ClientGetter
state) {
if(!state.getURI().equals(revocationURI)){
+ if(result == null || result.asBucket() == null ||
result.asBucket().size() == 0) {
+ Logger.error(this, "Cannot update: result
either null or empty for "+availableVersion);
+ System.err.println("Cannot update: result
either null or empty for "+availableVersion);
+ return;
+ }
System.out.println("Found "+fetchingVersion);
Logger.normal(this, "Found a new version! (" +
fetchingVersion + ", setting up a new UpdatedVersionAviableUserAlert");
alert.set(availableVersion,fetchingVersion,true);
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-08-17 13:28:38 UTC (rev 10158)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-08-17 13:49:42 UTC (rev 10159)
@@ -38,10 +38,10 @@
".
("+updater.getRevocationDNFCounter()+"/"+NodeUpdater.REVOCATION_DNF_MIN+")";
} else {
s+="Updating to "+version+" is advised. ";
- if(isReady) return s+
- " <form action=\"/\" method=\"post\"><input
type=\"submit\" name=\"update\" value=\"Update to "+readyVersion+" Now\"
/></form>";
- else return s+
- "Your node is currently fetching the update and
will ask you whether you want to update or not when it's ready.";
+ if(isReady) s += " <form action=\"/\"
method=\"post\"><input type=\"submit\" name=\"update\" value=\"Update to
"+readyVersion+" Now\" /></form>";
+ if(readyVersion < version || !isReady)
+ s += "Your node is currently fetching the update and
will ask you whether you want to update or not when it's ready.";
+ return s;
}
}
