Fix BUG #38

FOGProject · May 29, 2015 · 3b9cc0b · 3b9cc0b
1 parent 72218a0
commit 3b9cc0b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/AbstractService/AbstractService.cs b/AbstractService/AbstractService.cs
@@ -77,7 +77,6 @@ protected virtual void ModuleLooper()
 
                 // Once all modules have been run, sleep for the set time
                 var sleepTime = GetSleepTime() ?? DefaultSleepTime;
-                RegistryHandler.SetSystemSetting("Sleep", sleepTime.ToString());
                 Log.Entry(Name, string.Format("Sleeping for {0} seconds", sleepTime));
                 Thread.Sleep(sleepTime * 1000);
             } 

diff --git a/Debugger/obj/Release/Debugger.csproj.FileListAbsolute.txt b/Debugger/obj/Release/Debugger.csproj.FileListAbsolute.txt
@@ -8,4 +8,3 @@ D:\fog\client\Debugger\bin\x86\Release\Handlers.dll
 D:\fog\client\Debugger\bin\x86\Release\Modules.dll
 D:\fog\client\Debugger\bin\x86\Release\ManagedOpenSsl.dll
 D:\fog\client\Debugger\bin\x86\Release\Microsoft.Win32.TaskScheduler.dll
-D:\fog\client\bin\Debugger.exe.config
diff --git a/FOGService.Tests/Handlers/CommunicationTests.cs b/FOGService.Tests/Handlers/CommunicationTests.cs
@@ -89,7 +89,7 @@ public void GetResponse()
             Assert.AreEqual("bar", response.GetField("#Foo"));
             Assert.IsEmpty(response.GetField("#Empty"));
             Assert.AreEqual("Special", response.GetField("#-X"));
-            Assert.IsEmpty(response.GetField("#NON_EXISTENT"));
+            Assert.IsNull(response.GetField("#NON_EXISTENT"));
         }
 
         [Test]
@@ -105,8 +105,6 @@ public void GetRawResponse()
             Assert.AreEqual(phrase, response);
         }
 
-
-
         [Test]
         public void ParseResponse()
         {
@@ -125,7 +123,7 @@ public void ParseResponse()
             Assert.AreEqual("bar", response.GetField("#Foo"));
             Assert.IsEmpty(response.GetField("#Empty"));
             Assert.AreEqual("Special", response.GetField("#-X"));
-            Assert.IsEmpty(response.GetField("#NON_EXISTENT"));
+            Assert.IsNull(response.GetField("#NON_EXISTENT"));
         }
 
         [Test]

diff --git a/FOGService.v12.suo b/FOGService.v12.suo
diff --git a/Service/FOGSystemService.cs b/Service/FOGSystemService.cs
@@ -119,7 +119,10 @@ protected override void ModuleLooper()
             {
                 var sleepTime = int.Parse(response.GetField("#sleep"));
                 if (sleepTime >= DefaultSleepTime)
+                {
+                    RegistryHandler.SetSystemSetting("Sleep", sleepTime.ToString());
                     return sleepTime;
+                }
 
                 Log.Entry(Name, string.Format("Sleep time set on the server is below the minimum of {0}", DefaultSleepTime));
             }