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

Fixing build after merge

This commit is contained in:
moozzyk 2017-02-15 09:49:39 -08:00
parent cb7692d16e
commit 94dc265658
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
View File

@ -84,7 +84,7 @@ namespace Microsoft.AspNetCore.Sockets.Client
Debug.Assert((receiveResult.MessageType == WebSocketMessageType.Binary || receiveResult.MessageType == WebSocketMessageType.Text ), "Unexpected message type"); Debug.Assert((receiveResult.MessageType == WebSocketMessageType.Binary || receiveResult.MessageType == WebSocketMessageType.Text ), "Unexpected message type");
Message message; Message message;
var messageType = receiveResult.MessageType == WebSocketMessageType.Binary ? Format.Binary : Format.Text; var messageType = receiveResult.MessageType == WebSocketMessageType.Binary ? MessageType.Binary : MessageType.Text;
if (incomingMessage.Count > 1) if (incomingMessage.Count > 1)
{ {
var messageBuffer = new byte[totalBytes]; var messageBuffer = new byte[totalBytes];
@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Sockets.Client
Buffer.BlockCopy(incomingMessage[i].Array, 0, messageBuffer, offset, incomingMessage[i].Count); Buffer.BlockCopy(incomingMessage[i].Array, 0, messageBuffer, offset, incomingMessage[i].Count);
offset += incomingMessage[i].Count; offset += incomingMessage[i].Count;
} }
message = new Message(ReadableBuffer.Create(messageBuffer).Preserve(), messageType, receiveResult.EndOfMessage); message = new Message(ReadableBuffer.Create(messageBuffer).Preserve(), messageType, receiveResult.EndOfMessage);
} }
else else
@ -125,7 +125,7 @@ namespace Microsoft.AspNetCore.Sockets.Client
try try
{ {
await _webSocket.SendAsync(new ArraySegment<byte>(message.Payload.Buffer.ToArray()), await _webSocket.SendAsync(new ArraySegment<byte>(message.Payload.Buffer.ToArray()),
message.MessageFormat == Format.Text ? WebSocketMessageType.Text : WebSocketMessageType.Binary, true, message.Type == MessageType.Text ? WebSocketMessageType.Text : WebSocketMessageType.Binary, true,
cancellationToken); cancellationToken);
} }
catch (OperationCanceledException ex) catch (OperationCanceledException ex)

4
test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
View File

@ -87,7 +87,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
var transport = new WebSocketsTransport(); var transport = new WebSocketsTransport();
using (var connection = await ClientConnection.ConnectAsync(new Uri(baseUrl + "/echo/ws"), transport, loggerFactory)) using (var connection = await ClientConnection.ConnectAsync(new Uri(baseUrl + "/echo/ws"), transport, loggerFactory))
{ {
await connection.SendAsync(Encoding.UTF8.GetBytes(message), Format.Text); await connection.SendAsync(Encoding.UTF8.GetBytes(message), MessageType.Text);
var receiveData = new ReceiveData(); var receiveData = new ReceiveData();
@ -116,7 +116,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
var transport = new WebSocketsTransport(); var transport = new WebSocketsTransport();
using (var connection = await ClientConnection.ConnectAsync(new Uri(baseUrl + "/echo/ws"), transport, loggerFactory)) using (var connection = await ClientConnection.ConnectAsync(new Uri(baseUrl + "/echo/ws"), transport, loggerFactory))
{ {
await connection.SendAsync(Encoding.UTF8.GetBytes(message), Format.Text); await connection.SendAsync(Encoding.UTF8.GetBytes(message), MessageType.Text);
var receiveData = new ReceiveData(); var receiveData = new ReceiveData();