Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Christian Kratky
2019-10-03 15:25:02 +02:00
2 changed files with 6 additions and 6 deletions
+5 -5
View File
@@ -8,7 +8,7 @@ namespace MQTTnet.Internal
{
private readonly object _syncRoot = new object();
private readonly LinkedList<TItem> _items = new LinkedList<TItem>();
private readonly ManualResetEvent _gate = new ManualResetEvent(false);
private readonly ManualResetEventSlim _gate = new ManualResetEventSlim(false);
public int Count
{
@@ -32,7 +32,7 @@ namespace MQTTnet.Internal
}
}
public TItem Dequeue()
public TItem Dequeue(CancellationToken cancellationToken = default(CancellationToken))
{
while (true)
{
@@ -52,11 +52,11 @@ namespace MQTTnet.Internal
}
}
_gate.WaitOne();
_gate.Wait(cancellationToken);
}
}
public TItem PeekAndWait()
public TItem PeekAndWait(CancellationToken cancellationToken = default(CancellationToken))
{
while (true)
{
@@ -73,7 +73,7 @@ namespace MQTTnet.Internal
}
}
_gate.WaitOne();
_gate.Wait(cancellationToken);
}
}