commit 8693c1bde507b7af52d096a60e8160c1f9207d51
author Michael André Pearce <michaelpearce@apache.org> Thu Aug 01 16:43:36 2019 +0100
committer GitHub <noreply@github.com> Thu Aug 01 16:43:36 2019 +0100
tree 712bb4ce4b932548ee569e0ddf87b49de7ac215a
parent 9c1d2f1ecf59a236072c37bf3aa38babbfc1dc8b
parent 640ec72d4bfd9dd585dbec150ad608fab7b7549d

Merge pull request #11 from HavretGC/AMQNET-594_Race_condition_during_session_creation

AMQNET-594: Race condition during session creation

src/NMS.AMQP/NmsConnection.cs

diff --git a/src/NMS.AMQP/NmsConnection.cs b/src/NMS.AMQP/NmsConnection.cs
index 0383c14..307ebed 100644
--- a/src/NMS.AMQP/NmsConnection.cs
+++ b/src/NMS.AMQP/NmsConnection.cs
@@ -446,23 +446,32 @@
 
         private void CreateNmsConnection()
         {
-            if (connected.CompareAndSet(false, true))
+            if (connected || closed)
             {
-                try
-                {
-                    provider.Connect(ConnectionInfo).ConfigureAwait(false).GetAwaiter().GetResult();
-                }
-                catch (Exception e)
+                return;
+            }
+
+            lock (syncRoot)
+            {
+                if (!closed && connected.CompareAndSet(false, true))
                 {
                     try
                     {
-                        provider.Close();
+                        provider.Connect(ConnectionInfo).ConfigureAwait(false).GetAwaiter().GetResult();
+                    
                     }
-                    catch
+                    catch (Exception e)
                     {
-                    }
+                        try
+                        {
+                            provider.Close();
+                        }
+                        catch
+                        {
+                        }
 
-                    throw NMSExceptionSupport.Create(e);
+                        throw NMSExceptionSupport.Create(e);
+                    }
                 }
             }
         }