Author: toad
Date: 2008-12-12 16:45:52 +0000 (Fri, 12 Dec 2008)
New Revision: 24273
Modified:
trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
Log:
Pass this info in.
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
2008-12-12 16:42:55 UTC (rev 24272)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdateManager.java
2008-12-12 16:45:52 UTC (rev 24273)
@@ -600,8 +600,12 @@
/**
* Called when a new jar has been downloaded.
* @param isExt If true, the new jar is the ext jar; if false, it is
the main jar.
+ * @param recommendedExt If isExt is false, the recommended ext version
(upper bound)
+ * for the new jar, or -1 if it was not specified or the parse failed.
+ * @param requiredExt If isExt is false, the required ext version
(lower bound) for the
+ * new jar, or -1 if it was not specified or the parse failed.
*/
- void onDownloadedNewJar(boolean isExt) {
+ void onDownloadedNewJar(boolean isExt, int requiredExt, int
recommendedExt) {
synchronized(this) {
if(isExt) {
if(extUpdater.getFetchedVersion() >
NodeStarter.extBuildNumber) {
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2008-12-12
16:42:55 UTC (rev 24272)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2008-12-12
16:45:52 UTC (rev 24273)
@@ -210,6 +210,8 @@
void onSuccess(FetchResult result, ClientGetter state, File
tempBlobFile, int fetchedVersion) {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ int requiredExt = -1;
+ int recommendedExt = -1;
synchronized(this) {
if(fetchedVersion <= this.fetchedVersion) {
tempBlobFile.delete();
@@ -249,8 +251,6 @@
if(fetchedVersion > currentVersion)
Logger.normal(this, "Found version " +
fetchedVersion + ", setting up a new UpdatedVersionAvailableUserAlert");
if(!extUpdate) {
- int requiredExt = -1;
- int recommendedExt = -1;
InputStream is = null;
try {
is = result.asBucket().getInputStream();
@@ -310,7 +310,7 @@
this.result.asBucket().free();
this.result = result;
}
- manager.onDownloadedNewJar(extUpdate);
+ manager.onDownloadedNewJar(extUpdate, requiredExt,
recommendedExt);
}
private static final String REQUIRED_EXT_PREFIX =
"Required-Ext-Version: ";
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
