Author: toad
Date: 2006-11-18 18:10:38 +0000 (Sat, 18 Nov 2006)
New Revision: 10987
Modified:
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
Log:
Revocation URI not necessary on NodeUpdater.
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-11-18
17:43:18 UTC (rev 10986)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-11-18
18:10:38 UTC (rev 10987)
@@ -30,7 +30,6 @@
private ClientGetter cg;
private boolean finalCheck;
private final FreenetURI URI;
- private final FreenetURI revocationURI;
private final Ticker ticker;
public final NodeClientCore core;
private final Node node;
@@ -47,12 +46,11 @@
public final boolean extUpdate;
- NodeUpdater(NodeUpdaterManager manager, FreenetURI URI, FreenetURI
revocationURI, boolean extUpdate, int current) {
+ NodeUpdater(NodeUpdaterManager manager, FreenetURI URI, boolean
extUpdate, int current) {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
this.manager = manager;
this.node = manager.node;
this.URI = URI.setSuggestedEdition(Version.buildNumber()+1);
- this.revocationURI = revocationURI;
this.ticker = node.ps;
this.core = node.clientCore;
this.currentVersion = current;
@@ -265,10 +263,6 @@
return URI;
}
- public FreenetURI getRevocationKey(){
- return revocationURI;
- }
-
public boolean inFinalCheck() {
return finalCheck;
}
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
2006-11-18 17:43:18 UTC (rev 10986)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
2006-11-18 18:10:38 UTC (rev 10987)
@@ -188,9 +188,9 @@
throw new
InvalidConfigValueException("Cannot update because not running under wrapper");
}
// Start it
- mainUpdater = new NodeUpdater(this, updateURI,
revocationURI, false, Version.buildNumber());
+ mainUpdater = new NodeUpdater(this, updateURI,
false, Version.buildNumber());
if(shouldUpdateExt)
- extUpdater = new NodeUpdater(this,
extURI, revocationURI, true, NodeStarter.extBuildNumber);
+ extUpdater = new NodeUpdater(this,
extURI, true, NodeStarter.extBuildNumber);
}
}
if(!enable) {