[#258] AmqpTransportInitiator.Complete is throwing a NullReferenceExc…

…eption
Azure · May 3, 2024 · e746169 · e746169
1 parent e7d70fe
commit e746169
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Microsoft.Azure.Amqp/Amqp/Transport/AmqpTransportInitiator.cs b/Microsoft.Azure.Amqp/Amqp/Transport/AmqpTransportInitiator.cs
@@ -237,12 +237,12 @@ void Complete(TransportAsyncCallbackArgs args)
         {
             if (args.Exception != null && args.Transport != null)
             {
-                args.Transport.SafeClose(args.Exception);
-                args.Transport = null;
                 if (args.Exception is ObjectDisposedException)
                 {
                     args.Exception = new IOException(AmqpResources.GetString(AmqpResources.AmqpTransportClosed, args.Transport.ToString()));
                 }
+                args.Transport.SafeClose(args.Exception);
+                args.Transport = null;
             }
 
             TransportAsyncCallbackArgs innerArgs = (TransportAsyncCallbackArgs)args.UserToken;