github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't TrySetException with a null exception

Browse Source
This commit is contained in:
RogueException
2016-08-01 22:39:17 -03:00
parent c6115ea7f6
commit 9fc92d016d
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Discord.Net/Rpc/DiscordRpcClient.cs
View File

@@ -113,18 +113,19 @@ namespace Discord.Rpc
} }
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task DisconnectAsync() /// <inheritdoc />
public Task DisconnectAsync() => DisconnectAsync(null, false);
private async Task DisconnectAsync(Exception ex = null, bool isReconnecting = false)
{ {
await _connectionLock.WaitAsync().ConfigureAwait(false); if (ex == null)
try
{ {
await DisconnectInternalAsync(null, false).ConfigureAwait(false); if (_connectTask?.TrySetCanceled() ?? false) return;
} }
finally { _connectionLock.Release(); } else
} {
private async Task DisconnectAsync(Exception ex, bool isReconnecting) if (_connectTask?.TrySetException(ex) ?? false) return;
{ }
if (_connectTask?.TrySetException(ex) ?? false) return;
await _connectionLock.WaitAsync().ConfigureAwait(false); await _connectionLock.WaitAsync().ConfigureAwait(false);
try try
{ {

19
src/Discord.Net/WebSocket/DiscordSocketClient.cs
View File

@@ -181,19 +181,18 @@ namespace Discord.WebSocket
} }
} }
/// <inheritdoc /> /// <inheritdoc />
public async Task DisconnectAsync() public Task DisconnectAsync() => DisconnectAsync(null, false);
private async Task DisconnectAsync(Exception ex = null, bool isReconnecting = false)
{ {
if (_connectTask?.TrySetCanceled() ?? false) return; if (ex == null)
await _connectionLock.WaitAsync().ConfigureAwait(false);
try
{ {
await DisconnectInternalAsync(null, false).ConfigureAwait(false); if (_connectTask?.TrySetCanceled() ?? false) return;
} }
finally { _connectionLock.Release(); } else
} {
private async Task DisconnectAsync(Exception ex, bool isReconnecting) if (_connectTask?.TrySetException(ex) ?? false) return;
{ }
if (_connectTask?.TrySetException(ex) ?? false) return;
await _connectionLock.WaitAsync().ConfigureAwait(false); await _connectionLock.WaitAsync().ConfigureAwait(false);
try try
{ {