Thread runs only when enabled and also when module is started.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4201 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/update/UpdateManager.java

@@ -102,29 +102,22 @@ public class UpdateManager extends BasicModule {
                     Thread.sleep(15000);
                     // Load last saved information (if any)
                     loadSavedInfo();
-                    while (true) {
-                        // Check if the service is enabled
+                    while (isServiceEnabled()) {
+                        waitForNextChecking();
+                        // Check if the service is still enabled
                         if (isServiceEnabled()) {
-                            waitForNextChecking();
-                            // Check if the service is still enabled
-                            if (isServiceEnabled()) {
-                                try {
-                                    // Check for server updates
-                                    checkForServerUpdate(true);
-                                    // Refresh list of available plugins and check for plugin updates
-                                    checkForPluginsUpdates(true);
-                                    // Keep track of the last time we checked for updates
-                                    JiveGlobals.setProperty("update.lastCheck",
-                                            String.valueOf(System.currentTimeMillis()));
-                                }
-                                catch (Exception e) {
-                                    Log.error("Error checking for updates", e);
-                                }
+                            try {
+                                // Check for server updates
+                                checkForServerUpdate(true);
+                                // Refresh list of available plugins and check for plugin updates
+                                checkForPluginsUpdates(true);
+                                // Keep track of the last time we checked for updates
+                                JiveGlobals.setProperty("update.lastCheck",
+                                        String.valueOf(System.currentTimeMillis()));
+                            }
+                            catch (Exception e) {
+                                Log.error("Error checking for updates", e);
                             }
-                        }
-                        else {
-                            // Service is not enabled so sleep for 5 minutes
-                             Thread.sleep(300000);
                         }
                     }
                 }
@@ -306,6 +299,9 @@ public class UpdateManager extends BasicModule {
      */
     public void setServiceEnabled(boolean enabled) {
         JiveGlobals.setProperty("update.service-enabled", enabled ? "true" : "false");
+        if (enabled && thread == null) {
+            startService();
+        }
     }
 
     /**