DarthAffe/OBD.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/OBD.NET.git synced 2025-12-12 08:48:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4 from romanlum/OperationCanceledException-fix

Browse Source 
this fixes #3
This commit is contained in:
DarthAffe 2017-08-18 18:03:50 +02:00 committed by GitHub
commit 34f665628c
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs
View File

@ -192,19 +192,23 @@ namespace OBD.NET.Common.Devices
{
while (!_commandCancellationToken.IsCancellationRequested)
{
CurrentCommand = null;
if (_commandQueue.TryTake(out CurrentCommand, Timeout.Infinite, _commandCancellationToken.Token))
currentCommand = null;
try
{
Logger?.WriteLine("Writing Command: '" + CurrentCommand.CommandText.Replace('\r', '\'') + "'", OBDLogLevel.Verbose);
if (commandQueue.TryTake(out currentCommand, Timeout.Infinite, commandCancellationToken.Token))
{
Logger?.WriteLine("Writing Command: '" + currentCommand.CommandText.Replace('\r', '\'') + "'", OBDLogLevel.Verbose);
if (Connection.IsAsync)
await Connection.WriteAsync(Encoding.ASCII.GetBytes(CurrentCommand.CommandText));
else
Connection.Write(Encoding.ASCII.GetBytes(CurrentCommand.CommandText));
//wait for command to finish
_commandFinishedEvent.WaitOne();
if (Connection.IsAsync)
await Connection.WriteAsync(Encoding.ASCII.GetBytes(currentCommand.CommandText));
else
Connection.Write(Encoding.ASCII.GetBytes(currentCommand.CommandText));
//wait for command to finish
commandFinishedEvent.WaitOne();
}
}
catch (OperationCanceledException)
{/*ignore, because it is thrown when the cancellation token is canceled*/}
}
}
@ -213,9 +217,9 @@ namespace OBD.NET.Common.Devices
/// </summary>
public virtual void Dispose()
{
_commandCancellationToken?.Cancel();
_commandWorkerTask?.Wait();
commandQueue.CompleteAdding();
commandCancellationToken?.Cancel();
commandWorkerTask?.Wait();
Connection?.Dispose();
}