Refactor some of the send / receive logic

References #21
Lawo · Apr 26, 2016 · b18891d · b18891d
1 parent e262531
commit b18891d
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/Lawo.EmberPlusSharp/Model/Consumer.cs b/Lawo.EmberPlusSharp/Model/Consumer.cs
@@ -292,7 +292,7 @@ private async void ReceiveLoop()
             {
                 while (true)
                 {
-                    await this.WaitForAndApplyChanges();
+                    await this.WaitForAndApplyProviderChangesAsync();
                     await this.RetrieveChildrenAsync();
                 }
             }
@@ -320,9 +320,7 @@ private async void AutoSendLoop()
             {
                 while (true)
                 {
-                    await this.hasChangesSetSource.Task;
-                    await this.DelayAutoSend();
-                    this.hasChangesSetSource = new TaskCompletionSource<bool>();
+                    await this.WaitForLocalChangesAsync();
                     await this.SendAsync();
                 }
 
@@ -343,15 +341,22 @@ private async void AutoSendLoop()
             }
         }
 
+        private async Task WaitForLocalChangesAsync()
+        {
+            await this.hasChangesSetSource.Task;
+            await this.DelayAutoSend();
+            this.hasChangesSetSource = new TaskCompletionSource<bool>();
+        }
+
         private async Task RetrieveChildrenCoreAsync()
         {
             while (await this.SendRequestAsync())
             {
-                await this.WaitForAndApplyChanges();
+                await this.WaitForAndApplyProviderChangesAsync();
             }
         }
 
-        private async Task WaitForAndApplyChanges()
+        private async Task WaitForAndApplyProviderChangesAsync()
         {
             await this.receiveQueue.WaitForMessageAsync();