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,9 +102,7 @@ public class UpdateManager extends BasicModule {
                     Thread.sleep(15000);
                     // Load last saved information (if any)
                     loadSavedInfo();
-                    while (true) {
-                        // Check if the service is enabled
-                        if (isServiceEnabled()) {
+                    while (isServiceEnabled()) {
                         waitForNextChecking();
                         // Check if the service is still enabled
                         if (isServiceEnabled()) {
@@ -122,11 +120,6 @@ public class UpdateManager extends BasicModule {
                             }
                         }
                     }
-                        else {
-                            // Service is not enabled so sleep for 5 minutes
-                             Thread.sleep(300000);
-                        }
-                    }
                 }
                 catch (InterruptedException e) {
                     Log.error(e);
@@ -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();
+        }
     }
 
     /**