Some more cleaning up:

This commit is contained in:
Lucas Rosa
2019-10-29 12:55:57 -03:00
parent 5c25905510
commit 4105beb7e6
4 changed files with 4 additions and 9 deletions
@@ -12,7 +12,6 @@ using MQTTnet.PacketDispatcher;
using MQTTnet.Packets;
using MQTTnet.Protocol;
using MQTTnet.Server.Status;
using static MQTTnet.Server.MqttClientSessionsManager;
namespace MQTTnet.Server
{
@@ -1,7 +1,6 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MQTTnet.Adapter;
@@ -231,8 +230,7 @@ namespace MQTTnet.Server
{
var disconnectType = MqttClientDisconnectType.NotClean;
string clientId = null;
var ok = true;
var clientWasConnected = true;
try
{
@@ -249,7 +247,7 @@ namespace MQTTnet.Server
if (connectionValidatorContext.ReasonCode != MqttConnectReasonCode.Success)
{
ok = false;
clientWasConnected = false;
// Send failure response here without preparing a session. The result for a successful connect
// will be sent from the session itself.
var connAckPacket = channelAdapter.PacketFormatterAdapter.DataConverter.CreateConnAckPacket(connectionValidatorContext);
@@ -263,7 +261,6 @@ namespace MQTTnet.Server
await _eventDispatcher.HandleClientConnectedAsync(clientId).ConfigureAwait(false);
disconnectType = await connection.RunAsync().ConfigureAwait(false);
}
catch (OperationCanceledException)
{
@@ -274,7 +271,7 @@ namespace MQTTnet.Server
}
finally
{
if (ok)
if (clientWasConnected)
{
if (clientId != null)
{
@@ -4,7 +4,6 @@ using System.Linq;
using System.Threading.Tasks;
using MQTTnet.Packets;
using MQTTnet.Protocol;
using static MQTTnet.Server.MqttClientSessionsManager;
namespace MQTTnet.Server
{
@@ -158,6 +157,7 @@ namespace MQTTnet.Server
{
continue;
}
qosLevels.Add(subscription.Value.QualityOfServiceLevel);
}
}
@@ -2,7 +2,6 @@
using System.Threading.Tasks;
using MQTTnet.Client.Receiving;
using MQTTnet.Diagnostics;
using static MQTTnet.Server.MqttClientSessionsManager;
namespace MQTTnet.Server
{