Respond to feedback

dotnet · Apr 13, 2021 · a9a5619 · a9a5619
1 parent b147ac7
commit a9a5619
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs
@@ -44,8 +44,7 @@ public override void AdvanceTo(SequencePosition consumed, SequencePosition exami
 
         public override bool TryReadInternal(out ReadResult readResult)
         {
-            Task startTask = TryStartAsync();
-            Debug.Assert(startTask.IsCompleted);
+            TryStartAsync();
 
             var boolResult = _requestBodyPipe.Reader.TryRead(out _readResult);
 

diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/MessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/MessageBody.cs
@@ -140,13 +140,7 @@ protected Task TryStartAsync()
                 }
             }
 
-            Task readTask = OnReadStartedAsync();
-            if (!readTask.IsCompletedSuccessfully)
-            {
-                return readTask;
-            }
-
-            return Task.CompletedTask;
+            return OnReadStartedAsync();
         }
 
         protected void TryStop()
@@ -207,6 +201,10 @@ protected ValueTask<ReadResult> StartTimingReadAsync(ValueTask<ReadResult> readA
                 {
                     return StartTimingReadAwaited(continueTask, readAwaitable, cancellationToken);
                 }
+                else
+                {
+                    continueTask.GetAwaiter().GetResult();
+                }
 
                 if (_timingEnabled)
                 {

diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2MessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2MessageBody.cs
@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2
@@ -39,7 +40,7 @@ protected override Task OnReadStartedAsync()
                 ValueTask<FlushResult> continueTask = TryProduceContinueAsync();
                 if (!continueTask.IsCompletedSuccessfully)
                 {
-                    return continueTask.AsTask();
+                    return continueTask.GetAsTask();
                 }
             }
 
@@ -66,8 +67,7 @@ public override void AdvanceTo(SequencePosition consumed, SequencePosition exami
 
         public override bool TryRead(out ReadResult readResult)
         {
-            Task startTask = TryStartAsync();
-            Debug.Assert(startTask.IsCompleted);
+            TryStartAsync();
 
             var hasResult = _context.RequestBodyPipe.Reader.TryRead(out readResult);