Resolve merge conflicts

John Luo · John Luo · commit 98a94bec8d81 · 2020-10-22T13:12:50.000-07:00
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1MessageBody.cs
@@ -192,7 +192,7 @@ public static MessageBody For(
         }
 
         [StackTraceHidden]
-        private void ThrowIfReaderCompleted()
+        protected void ThrowIfReaderCompleted()
         {
             if (_readerCompleted)
             {
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1UpgradeMessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1UpgradeMessageBody.cs
@@ -27,13 +27,13 @@ public Http1UpgradeMessageBody(Http1Connection context, bool keepAlive)
 
         public override ValueTask<ReadResult> ReadAsync(CancellationToken cancellationToken = default)
         {
-            ThrowIfCompleted();
+            ThrowIfReaderCompleted();
             return ReadAsyncInternal(cancellationToken);
         }
 
         public override bool TryRead(out ReadResult result)
         {
-            ThrowIfCompleted();
+            ThrowIfReaderCompleted();
             return TryReadInternal(out result);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public static MessageBody For(`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`[StackTraceHidden]`
`195`		`- private void ThrowIfReaderCompleted()`
	`195`	`+ protected void ThrowIfReaderCompleted()`
`196`	`196`	`{`
`197`	`197`	`if (_readerCompleted)`
`198`	`198`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ public Http1UpgradeMessageBody(Http1Connection context, bool keepAlive)`
`27`	`27`
`28`	`28`	`public override ValueTask<ReadResult> ReadAsync(CancellationToken cancellationToken = default)`
`29`	`29`	`{`
`30`		`- ThrowIfCompleted();`
	`30`	`+ ThrowIfReaderCompleted();`
`31`	`31`	`return ReadAsyncInternal(cancellationToken);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public override bool TryRead(out ReadResult result)`
`35`	`35`	`{`
`36`		`- ThrowIfCompleted();`
	`36`	`+ ThrowIfReaderCompleted();`
`37`	`37`	`return TryReadInternal(out result);`
`38`	`38`	`}`
`39`	`39`