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

fixed unittest server and client both generated id 2 for differnt package types

Browse Source
This commit is contained in:
Eggers Jan
2017-09-14 13:37:45 +02:00
parent f04a9c4f3e
commit 089eb9b604
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MQTTnet.Core/Client/MqttPacketDispatcher.cs
+14 -8
View File
@@ -14,7 +14,7 @@ namespace MQTTnet.Core.Client
private readonly object _syncRoot = new object(); private readonly object _syncRoot = new object();
private readonly HashSet<MqttBasePacket> _receivedPackets = new HashSet<MqttBasePacket>(); private readonly HashSet<MqttBasePacket> _receivedPackets = new HashSet<MqttBasePacket>();
private readonly ConcurrentDictionary<Type, TaskCompletionSource<MqttBasePacket>> _packetByResponseType = new ConcurrentDictionary<Type, TaskCompletionSource<MqttBasePacket>>(); private readonly ConcurrentDictionary<Type, TaskCompletionSource<MqttBasePacket>> _packetByResponseType = new ConcurrentDictionary<Type, TaskCompletionSource<MqttBasePacket>>();
private readonly ConcurrentDictionary<ushort, TaskCompletionSource<MqttBasePacket>> _packetByIdentifier = new ConcurrentDictionary<ushort, TaskCompletionSource<MqttBasePacket>>(); private readonly ConcurrentDictionary<Type, ConcurrentDictionary<ushort,TaskCompletionSource<MqttBasePacket>>> _packetByResponseTypeAndIdentifier = new ConcurrentDictionary<Type, ConcurrentDictionary<ushort,TaskCompletionSource<MqttBasePacket>>>();
public async Task<MqttBasePacket> WaitForPacketAsync(MqttBasePacket request, Type responseType, TimeSpan timeout) public async Task<MqttBasePacket> WaitForPacketAsync(MqttBasePacket request, Type responseType, TimeSpan timeout)
{ {
@@ -42,17 +42,21 @@ namespace MQTTnet.Core.Client
{ {
if (packet == null) throw new ArgumentNullException(nameof(packet)); if (packet == null) throw new ArgumentNullException(nameof(packet));
var type = packet.GetType();
var packetDispatched = false; var packetDispatched = false;
if (packet is IMqttPacketWithIdentifier withIdentifier) if (packet is IMqttPacketWithIdentifier withIdentifier)
{ {
if (_packetByIdentifier.TryRemove(withIdentifier.PacketIdentifier, out var tcs)) if (_packetByResponseTypeAndIdentifier.TryGetValue(type, out var byid))
{ {
tcs.TrySetResult(packet); if (byid.TryRemove( withIdentifier.PacketIdentifier, out var tcs))
packetDispatched = true; {
tcs.TrySetResult( packet );
packetDispatched = true;
}
} }
} }
else if (_packetByResponseType.TryRemove(packet.GetType(), out var tcs)) else if (_packetByResponseType.TryRemove(type, out var tcs))
{ {
tcs.TrySetResult(packet); tcs.TrySetResult(packet);
packetDispatched = true; packetDispatched = true;
@@ -78,7 +82,7 @@ namespace MQTTnet.Core.Client
_receivedPackets.Clear(); _receivedPackets.Clear();
} }
_packetByIdentifier.Clear(); _packetByResponseTypeAndIdentifier.Clear();
} }
private TaskCompletionSource<MqttBasePacket> AddPacketAwaiter(MqttBasePacket request, Type responseType) private TaskCompletionSource<MqttBasePacket> AddPacketAwaiter(MqttBasePacket request, Type responseType)
@@ -86,7 +90,8 @@ namespace MQTTnet.Core.Client
var tcs = new TaskCompletionSource<MqttBasePacket>(); var tcs = new TaskCompletionSource<MqttBasePacket>();
if (request is IMqttPacketWithIdentifier withIdent) if (request is IMqttPacketWithIdentifier withIdent)
{ {
_packetByIdentifier[withIdent.PacketIdentifier] = tcs; var byId = _packetByResponseTypeAndIdentifier.GetOrAdd(responseType, key => new ConcurrentDictionary<ushort, TaskCompletionSource<MqttBasePacket>>());
byId[withIdent.PacketIdentifier] = tcs;
} }
else else
{ {
@@ -100,7 +105,8 @@ namespace MQTTnet.Core.Client
{ {
if (request is IMqttPacketWithIdentifier withIdent) if (request is IMqttPacketWithIdentifier withIdent)
{ {
_packetByIdentifier.TryRemove(withIdent.PacketIdentifier, out var _); var byId = _packetByResponseTypeAndIdentifier.GetOrAdd(responseType, key => new ConcurrentDictionary<ushort, TaskCompletionSource<MqttBasePacket>>());
byId.TryRemove(withIdent.PacketIdentifier, out var _);
} }
else else
{ {