Refactor receive logic

References #21
Lawo · Apr 26, 2016 · 8bce51e · 8bce51e
1 parent b18891d
commit 8bce51e
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/Lawo.EmberPlusSharp/Model/Consumer.cs b/Lawo.EmberPlusSharp/Model/Consumer.cs
@@ -292,7 +292,8 @@ private async void ReceiveLoop()
             {
                 while (true)
                 {
-                    await this.WaitForAndApplyProviderChangesAsync();
+                    await this.WaitForProviderChangesAsync();
+                    this.ApplyProviderChanges();
                     await this.RetrieveChildrenAsync();
                 }
             }
@@ -352,20 +353,24 @@ private async Task RetrieveChildrenCoreAsync()
         {
             while (await this.SendRequestAsync())
             {
-                await this.WaitForAndApplyProviderChangesAsync();
+                await this.WaitForProviderChangesAsync();
+                this.ApplyProviderChanges();
             }
         }
 
-        private async Task WaitForAndApplyProviderChangesAsync()
+        private void ApplyProviderChanges()
         {
-            await this.receiveQueue.WaitForMessageAsync();
-
             while (this.receiveQueue.MessageCount > 0)
             {
                 this.ApplyChange(this.receiveQueue.DequeueMessage());
             }
         }
 
+        private Task WaitForProviderChangesAsync()
+        {
+            return this.receiveQueue.WaitForMessageAsync();
+        }
+
         private void OnConnectionLost(object sender, ConnectionLostEventArgs e)
         {
             var handler = this.ConnectionLost;