Improved SemaphoreSlim handling

Author: ashneilson

RICADO.Omron/Channels/EthernetChannel.cs

@@ -87,13 +87,13 @@ internal async Task<ProcessRequestResult> ProcessRequestAsync(FINSRequest reques
 
             while (attempts <= retries)
             {
+                if (!_semaphore.Wait(0))
+                {
+                    await _semaphore.WaitAsync(cancellationToken);
+                }
+
                 try
                 {
-                    if (!_semaphore.Wait(0))
-                    {
-                        await _semaphore.WaitAsync(cancellationToken);
-                    }
-                    
                     if (attempts > 0)
                     {
                         await DestroyAndInitializeClient(timeout, cancellationToken);
@@ -149,13 +149,13 @@ internal async Task<ProcessRequestResult> ProcessRequestAsync(FINSRequest reques
             {
                 if(e.Message.Contains("Service ID") && responseMessage.Length >= 9 && responseMessage.Span[9] != request.ServiceID)
                 {
-                    try
+                    if (!_semaphore.Wait(0))
                     {
-                        if (!_semaphore.Wait(0))
-                        {
-                            await _semaphore.WaitAsync(cancellationToken);
-                        }
+                        await _semaphore.WaitAsync(cancellationToken);
+                    }
 
+                    try
+                    {
                         await PurgeReceiveBuffer(timeout, cancellationToken);
                     }
                     catch

RICADO.Omron/Channels/EthernetTCPChannel.cs

@@ -81,13 +81,13 @@ public override void Dispose()
 
         internal override async Task InitializeAsync(int timeout, CancellationToken cancellationToken)
         {
-            try
+            if (!Semaphore.Wait(0))
             {
-                if(!Semaphore.Wait(0))
-                {
-                    await Semaphore.WaitAsync(cancellationToken);
-                }
+                await Semaphore.WaitAsync(cancellationToken);
+            }
 
+            try
+            {
                 destroyClient();
 
                 await initializeClient(timeout, cancellationToken);

RICADO.Omron/Channels/EthernetUDPChannel.cs

@@ -51,13 +51,13 @@ public override void Dispose()
 
         internal override async Task InitializeAsync(int timeout, CancellationToken cancellationToken)
         {
-            try
+            if (!Semaphore.Wait(0))
             {
-                if (!Semaphore.Wait(0))
-                {
-                    await Semaphore.WaitAsync(cancellationToken);
-                }
+                await Semaphore.WaitAsync(cancellationToken);
+            }
 
+            try
+            {
                 destroyClient();
 
                 await initializeClient(timeout, cancellationToken);