YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-21 04:03:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor code.

Browse Source
This commit is contained in:
Christian
2021-10-24 21:19:40 +02:00
parent 5af54963a0
commit 43e4038212
39 changed files with 500 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Adapter/MqttChannelAdapter.cs
+16 -32
View File
@@ -76,40 +76,28 @@ namespace MQTTnet.Adapter
}
catch (Exception exception)
{
if (IsWrappedException(exception))
if (!WrapAndThrowException(exception))
{
throw;
}
WrapAndThrowException(exception);
}
}
public async Task DisconnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
public async Task DisconnectAsync(CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
ThrowIfDisposed();
try
{
if (timeout == TimeSpan.Zero)
{
await _channel.DisconnectAsync(cancellationToken).ConfigureAwait(false);
}
else
{
await MqttTaskTimeout.WaitAsync(
t => _channel.DisconnectAsync(t), timeout, cancellationToken).ConfigureAwait(false);
}
await _channel.DisconnectAsync(cancellationToken).ConfigureAwait(false);
}
catch (Exception exception)
{
if (IsWrappedException(exception))
if (!WrapAndThrowException(exception))
{
throw;
}
WrapAndThrowException(exception);
}
}
@@ -136,12 +124,10 @@ namespace MQTTnet.Adapter
}
catch (Exception exception)
{
if (IsWrappedException(exception))
if (!WrapAndThrowException(exception))
{
throw;
}
WrapAndThrowException(exception);
}
finally
{
@@ -192,12 +178,10 @@ namespace MQTTnet.Adapter
}
catch (Exception exception)
{
if (IsWrappedException(exception))
if (!WrapAndThrowException(exception))
{
throw;
}
WrapAndThrowException(exception);
}
return null;
@@ -386,17 +370,17 @@ namespace MQTTnet.Adapter
return value;
}
static bool IsWrappedException(Exception exception)
{
return exception is OperationCanceledException ||
exception is MqttCommunicationTimedOutException ||
exception is MqttCommunicationException ||
exception is MqttProtocolViolationException;
}
static void WrapAndThrowException(Exception exception)
static bool WrapAndThrowException(Exception exception)
{
if (exception is OperationCanceledException ||
exception is MqttCommunicationTimedOutException ||
exception is MqttCommunicationException ||
exception is MqttProtocolViolationException)
{
return false;
}
if (exception is IOException && exception.InnerException is SocketException innerException)
{
exception = innerException;