[freenet-cvs] r10216 - trunk/freenet/src/freenet/node/updater

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-08-20 13:53:12 +0000 (Sun, 20 Aug 2006)
New Revision: 10216

Modified:
   trunk/freenet/src/freenet/node/updater/NodeUpdater.java
   trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java
Log:
Prevent the updater from beeing started if not running under a properly 
configured wrapper (Some might need to update their freenet-ext.jar for it to 
work)

Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-08-20 
13:08:28 UTC (rev 10215)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java     2006-08-20 
13:53:12 UTC (rev 10216)
@@ -72,7 +72,6 @@
        private RevocationKeyFoundUserAlert revocationAlert;

        public NodeUpdater(Node n, boolean isAutoUpdateAllowed, FreenetURI URI, 
FreenetURI revocationURI) {
-               super();
                this.URI = URI;
                URI.setSuggestedEdition(Version.buildNumber()+1);
                this.revocationURI = revocationURI;

Modified: trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java  
2006-08-20 13:08:28 UTC (rev 10215)
+++ trunk/freenet/src/freenet/node/updater/UpdaterEnabledCallback.java  
2006-08-20 13:53:12 UTC (rev 10216)
@@ -7,6 +7,7 @@
 import freenet.config.InvalidConfigValueException;
 import freenet.keys.FreenetURI;
 import freenet.node.Node;
+import freenet.node.NodeStarter;
 import freenet.support.Logger;

 public class UpdaterEnabledCallback implements BooleanCallback {
@@ -20,14 +21,14 @@
        }

        public boolean get() {
-               if((node.nodeUpdater==null) || 
(!WrapperManager.isControlledByNativeWrapper()))
+               if((node.nodeUpdater==null) || 
(!WrapperManager.isControlledByNativeWrapper()) || (NodeStarter.extBuildNumber 
== -1))
                        return false;
                else 
                        return node.nodeUpdater.isRunning();
        }

        public void set(boolean val) throws InvalidConfigValueException {
-               if((val == true) && 
(!WrapperManager.isControlledByNativeWrapper())) {
+               if((val == true) && 
(!WrapperManager.isControlledByNativeWrapper()) && (NodeStarter.extBuildNumber 
== -1)) {
                        Logger.error(this, "Cannot update because not running 
under wrapper");
                        throw new InvalidConfigValueException("Cannot update 
because not running under wrapper");
                }