From fbbcb319abc4991b4e90bd17aedc55e72299c161 Mon Sep 17 00:00:00 2001 From: JKorf Date: Thu, 3 Jan 2019 08:52:44 +0100 Subject: [PATCH] Revert "added locks to socket" This reverts commit 4b382ed48057cb80c010bd8532f2fc6983e3464f. --- CryptoExchange.Net/Sockets/BaseSocket.cs | 37 ++++++++++-------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/CryptoExchange.Net/Sockets/BaseSocket.cs b/CryptoExchange.Net/Sockets/BaseSocket.cs index 4386e4f..e152e7c 100644 --- a/CryptoExchange.Net/Sockets/BaseSocket.cs +++ b/CryptoExchange.Net/Sockets/BaseSocket.cs @@ -115,7 +115,7 @@ namespace CryptoExchange.Net.Sockets { while (true) { - if (socket?.State != WebSocketState.Open) + if (socket == null || socket.State != WebSocketState.Open) return; if (DateTime.UtcNow - LastActionTime > Timeout) @@ -165,37 +165,30 @@ namespace CryptoExchange.Net.Sockets public virtual void Reset() { - lock (socketLock) - { - socket.Dispose(); - socket = null; - } + socket.Dispose(); + socket = null; } public virtual void Send(string data) { - lock (socketLock) - socket?.Send(data); + socket.Send(data); } public virtual async Task Connect() { - lock (socketLock) + if (socket == null) { - if (socket == null) + socket = new WebSocket(Url, cookies: cookies.ToList(), customHeaderItems: headers.ToList()) { - socket = new WebSocket(Url, cookies: cookies.ToList(), customHeaderItems: headers.ToList()) - { - EnableAutoSendPing = true, - AutoSendPingInterval = 10 - }; - socket.Security.EnabledSslProtocols = SSLProtocols; - socket.Opened += (o, s) => Handle(openHandlers); - socket.Closed += (o, s) => Handle(closeHandlers); - socket.Error += (o, s) => Handle(errorHandlers, s.Exception); - socket.MessageReceived += (o, s) => Handle(messageHandlers, s.Message); - socket.DataReceived += (o, s) => HandleByteData(s.Data); - } + EnableAutoSendPing = true, + AutoSendPingInterval = 10 + }; + socket.Security.EnabledSslProtocols = SSLProtocols; + socket.Opened += (o, s) => Handle(openHandlers); + socket.Closed += (o, s) => Handle(closeHandlers); + socket.Error += (o, s) => Handle(errorHandlers, s.Exception); + socket.MessageReceived += (o, s) => Handle(messageHandlers, s.Message); + socket.DataReceived += (o, s) => HandleByteData(s.Data); } return await Task.Run(() =>