diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-01-23 17:21:26 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-01-23 17:21:26 +0200 |
| commit | 89e7bce0f7241e210aefc9d902e11c8f3537ace9 (patch) | |
| tree | 436f667ed37e8ec61182b892c48440d0925840d7 | |
| parent | 13cb1dc09c21769eee5db838830ea9c48806b174 (diff) | |
| download | Tango-89e7bce0f7241e210aefc9d902e11c8f3537ace9.tar.gz Tango-89e7bce0f7241e210aefc9d902e11c8f3537ace9.zip | |
Merged a small fix from Beta+ to transport layer.
| -rw-r--r-- | Software/Visual_Studio/Tango.Transport/TransporterBase.cs | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs index b8aa96ea6..263e78933 100644 --- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs +++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs @@ -1071,14 +1071,28 @@ namespace Tango.Transport TransportMessageBase request = null; lock (_pendingRequests) { - var requests = _pendingRequests.ToList().Where(x => x.Token == container.Token).ToList(); + try + { + var requests = _pendingRequests.ToList().Where(x => x.Token == container.Token).ToList(); + + try + { + if (requests.Count > 1) + { + LogManager.Log($"{GetExtendedComponentName()}: {requests.Count} requests with the same token were detected - {(requests.First().Message.GetType().IsGenericType ? request.Message.GetType().GetGenericArguments()[0].Name : request.Message.GetType().Name)}.", LogCategory.Warning); + } + } + catch (Exception ex) + { + LogManager.Log(ex, LogCategory.Warning, "Something bad happened please investigate."); + } - if (requests.Count > 1) + request = requests.LastOrDefault(); + } + catch (Exception ex) { - LogManager.Log($"{GetExtendedComponentName()}: {requests.Count} requests with the same token were detected - {(requests.First().Message.GetType().IsGenericType ? request.Message.GetType().GetGenericArguments()[0].Name : request.Message.GetType().Name)}.", LogCategory.Warning); + LogManager.Log(ex, LogCategory.Warning, "Something bad happened please investigate."); } - - request = requests.LastOrDefault(); } if (request != null) |