Close socket if connection already timed out.

Azure · Sep 19, 2020 · 69fddda · 69fddda
1 parent ebb75bc
commit 69fddda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Microsoft.Azure.Amqp/Amqp/Transport/TcpTransportInitiator.cs b/Microsoft.Azure.Amqp/Amqp/Transport/TcpTransportInitiator.cs
@@ -50,7 +50,11 @@ public override bool ConnectAsync(TimeSpan timeout, TransportAsyncCallbackArgs c
             {
                 if (Interlocked.CompareExchange(ref this.state, 1, 0) == 0)
                 {
-                    this.Complete(connectEventArgs, true);
+                    this.Complete(this.connectEventArgs, true);
+                }
+                else
+                {
+                    this.connectEventArgs.ConnectSocket?.Dispose();
                 }
 
                 return false;

diff --git a/test/TestCases/AmqpTransportTests.cs b/test/TestCases/AmqpTransportTests.cs
@@ -111,11 +111,8 @@ internal static TransportBase AcceptServerTransport(TransportSettings settings)
             complete.WaitOne();
             complete.Dispose();
 
-            transport.Closed += (s, a) =>
-            {
-                listener.Close();
-                Debug.WriteLine("Listeners Closed.");
-            };
+            listener.Close();
+            Debug.WriteLine("Listeners Closed.");
 
             return transport;
         }