huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1757 from aspnet/release/2.1 

Always flush in WebSocketsTransport (#1756)
This commit is contained in:
Mikael Mengistu 2018-03-28 18:12:31 -07:00 committed by GitHub
parent 9ce543ade2 d5dafae2cc
commit 2bf962d362
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/WebSocketsTransport.cs
View File

@ -208,8 +208,6 @@ namespace Microsoft.AspNetCore.Sockets.Client.Internal
_application.Output.Advance(receiveResult.Count); _application.Output.Advance(receiveResult.Count);
if (receiveResult.EndOfMessage)
{
var flushResult = await _application.Output.FlushAsync(); var flushResult = await _application.Output.FlushAsync();
// We canceled in the middle of applying back pressure // We canceled in the middle of applying back pressure
@ -220,7 +218,6 @@ namespace Microsoft.AspNetCore.Sockets.Client.Internal
} }
} }
} }
}
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
Log.ReceiveCanceled(_logger); Log.ReceiveCanceled(_logger);