Sync over multi async should just wait once

aspnet · Jan 17, 2016 · 0ccdd69 · 0ccdd69
1 parent 2a3c33b
commit 0ccdd69
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
@@ -401,8 +401,7 @@ protected async Task FireOnCompleted()
 
         public void Flush()
         {
-            ProduceStartAndFireOnStarting(immediate: false).GetAwaiter().GetResult();
-            SocketOutput.Write(_emptyData, immediate: true);
+            FlushAsync(CancellationToken.None).GetAwaiter().GetResult();
         }
 
         public async Task FlushAsync(CancellationToken cancellationToken)
@@ -413,20 +412,7 @@ public async Task FlushAsync(CancellationToken cancellationToken)
 
         public void Write(ArraySegment<byte> data)
         {
-            ProduceStartAndFireOnStarting(immediate: false).GetAwaiter().GetResult();
-
-            if (_autoChunk)
-            {
-                if (data.Count == 0)
-                {
-                    return;
-                }
-                WriteChunkedAsync(data, RequestAborted);
-            }
-            else
-            {
-                SocketOutput.Write(data, immediate: true);
-            }
+            WriteAsync(data, CancellationToken.None).GetAwaiter().GetResult();
         }
 
         public Task WriteAsync(ArraySegment<byte> data, CancellationToken cancellationToken)