Author: nextgens
Date: 2006-08-30 11:27:06 +0000 (Wed, 30 Aug 2006)
New Revision: 10296
Modified:
trunk/freenet/src/freenet/node/updater/AutoUpdateAllowedCallback.java
trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java
Log:
Ensure the node-updater has been killed if not running under the wrapper.
Modified: trunk/freenet/src/freenet/node/updater/AutoUpdateAllowedCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/AutoUpdateAllowedCallback.java
2006-08-30 11:10:00 UTC (rev 10295)
+++ trunk/freenet/src/freenet/node/updater/AutoUpdateAllowedCallback.java
2006-08-30 11:27:06 UTC (rev 10296)
@@ -14,7 +14,7 @@
}
public boolean get() {
- if(node.getNodeUpdater()==null)
+ if((node.getNodeUpdater()==null) ||
!(node.getNodeUpdater().isRunning()))
return false;
else
return node.getNodeUpdater().isAutoUpdateAllowed;
Modified: trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java
2006-08-30 11:10:00 UTC (rev 10295)
+++ trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java
2006-08-30 11:27:06 UTC (rev 10296)
@@ -30,6 +30,11 @@
public void set(boolean val) throws InvalidConfigValueException {
if((val == true) &&
(!WrapperManager.isControlledByNativeWrapper()) && (NodeStarter.extBuildNumber
== -1)) {
Logger.error(this, "Cannot update because not running
under wrapper");
+ if(node.nodeUpdater != null){
+ node.nodeUpdater.kill();
+ Logger.normal(this, "Shutting down the node
updater");
+ }
+ set(false);
throw new InvalidConfigValueException("Cannot update
because not running under wrapper");
}
synchronized (node) {
