From 08bba972c14d1bac36a495c1a5dfdd2c1df4eecf Mon Sep 17 00:00:00 2001 From: David Fowler Date: Fri, 7 Oct 2016 16:18:23 -0700 Subject: [PATCH] React to channel API changes --- samples/SocketsSample/EndPoints/ChatEndPoint.cs | 5 +++-- samples/SocketsSample/EndPoints/JsonRpcEndpoint.cs | 3 ++- src/Microsoft.AspNetCore.Sockets/LongPolling.cs | 5 +++-- src/Microsoft.AspNetCore.Sockets/ServerSentEvents.cs | 5 +++-- src/Microsoft.AspNetCore.Sockets/WebSockets.cs | 5 +++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/samples/SocketsSample/EndPoints/ChatEndPoint.cs b/samples/SocketsSample/EndPoints/ChatEndPoint.cs index 5308d793d0..6e978d139a 100644 --- a/samples/SocketsSample/EndPoints/ChatEndPoint.cs +++ b/samples/SocketsSample/EndPoints/ChatEndPoint.cs @@ -17,10 +17,11 @@ namespace SocketsSample while (true) { - var input = await connection.Channel.Input.ReadAsync(); + var result = await connection.Channel.Input.ReadAsync(); + var input = result.Buffer; try { - if (input.IsEmpty && connection.Channel.Input.Reading.IsCompleted) + if (input.IsEmpty && result.IsCompleted) { break; } diff --git a/samples/SocketsSample/EndPoints/JsonRpcEndpoint.cs b/samples/SocketsSample/EndPoints/JsonRpcEndpoint.cs index 8f58de9343..8e9d3f28a0 100644 --- a/samples/SocketsSample/EndPoints/JsonRpcEndpoint.cs +++ b/samples/SocketsSample/EndPoints/JsonRpcEndpoint.cs @@ -58,7 +58,8 @@ namespace SocketsSample } catch (Exception) { - if (connection.Channel.Input.Reading.IsCompleted) + var result = await connection.Channel.Input.ReadAsync(); + if (result.IsCompleted) { break; } diff --git a/src/Microsoft.AspNetCore.Sockets/LongPolling.cs b/src/Microsoft.AspNetCore.Sockets/LongPolling.cs index 618ccb1b63..eed89f4330 100644 --- a/src/Microsoft.AspNetCore.Sockets/LongPolling.cs +++ b/src/Microsoft.AspNetCore.Sockets/LongPolling.cs @@ -18,9 +18,10 @@ namespace Microsoft.AspNetCore.Sockets public async Task ProcessRequest(HttpContext context) { - var buffer = await _channel.Output.ReadAsync(); + var result = await _channel.Output.ReadAsync(); + var buffer = result.Buffer; - if (buffer.IsEmpty && _channel.Output.Reading.IsCompleted) + if (buffer.IsEmpty && result.IsCompleted) { // Client should stop if it receives a 204 context.Response.StatusCode = 204; diff --git a/src/Microsoft.AspNetCore.Sockets/ServerSentEvents.cs b/src/Microsoft.AspNetCore.Sockets/ServerSentEvents.cs index 9c78b40cde..3ed0e24da3 100644 --- a/src/Microsoft.AspNetCore.Sockets/ServerSentEvents.cs +++ b/src/Microsoft.AspNetCore.Sockets/ServerSentEvents.cs @@ -24,9 +24,10 @@ namespace Microsoft.AspNetCore.Sockets while (true) { - var buffer = await _channel.Output.ReadAsync(); + var result = await _channel.Output.ReadAsync(); + var buffer = result.Buffer; - if (buffer.IsEmpty && _channel.Output.Reading.IsCompleted) + if (buffer.IsEmpty && result.IsCompleted) { break; } diff --git a/src/Microsoft.AspNetCore.Sockets/WebSockets.cs b/src/Microsoft.AspNetCore.Sockets/WebSockets.cs index 64fc41d402..a4070df6f5 100644 --- a/src/Microsoft.AspNetCore.Sockets/WebSockets.cs +++ b/src/Microsoft.AspNetCore.Sockets/WebSockets.cs @@ -73,11 +73,12 @@ namespace Microsoft.AspNetCore.Sockets { while (true) { - var buffer = await _channel.Output.ReadAsync(); + var result = await _channel.Output.ReadAsync(); + var buffer = result.Buffer; try { - if (buffer.IsEmpty && _channel.Output.Reading.IsCompleted) + if (buffer.IsEmpty && result.IsCompleted) { break; }