Refactorings

This commit is contained in:
Christian Kratky
2017-09-16 17:06:47 +02:00
parent dc65bdb913
commit b5fc6e3d12
7 changed files with 45 additions and 20 deletions
@@ -19,14 +19,20 @@ namespace MQTTnet.Implementations
public async Task ConnectAsync(MqttClientOptions options)
{
_webSocket = new ClientWebSocket();
await _webSocket.ConnectAsync(new Uri(options.Server), CancellationToken.None);
await _webSocket.ConnectAsync(new Uri(options.Server), CancellationToken.None).ConfigureAwait(false);
RawStream = new WebSocketStream(_webSocket);
}
public Task DisconnectAsync()
public async Task DisconnectAsync()
{
RawStream = null;
return _webSocket?.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
if (_webSocket == null)
{
return;
}
await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).ConfigureAwait(false);
}
public void Dispose()
@@ -23,10 +23,16 @@ namespace MQTTnet.Implementations
RawStream = new WebSocketStream(_webSocket);
}
public Task DisconnectAsync()
public async Task DisconnectAsync()
{
RawStream = null;
return _webSocket?.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
if (_webSocket == null)
{
return;
}
await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).ConfigureAwait(false);
}
public void Dispose()
@@ -19,14 +19,20 @@ namespace MQTTnet.Implementations
public async Task ConnectAsync(MqttClientOptions options)
{
_webSocket = new ClientWebSocket();
await _webSocket.ConnectAsync(new Uri(options.Server), CancellationToken.None);
await _webSocket.ConnectAsync(new Uri(options.Server), CancellationToken.None).ConfigureAwait(false);
RawStream = new WebSocketStream(_webSocket);
}
public Task DisconnectAsync()
public async Task DisconnectAsync()
{
RawStream = null;
return _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
if (_webSocket == null)
{
return;
}
await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).ConfigureAwait(false);
}
public void Dispose()