Re-apply lost changes from main

Author: pglombardo

Source/HiveMQtt/Client/Connection/ConnectionManagerTasks.cs

@@ -217,7 +217,9 @@ private async Task ConnectionPublishWriterAsync(CancellationToken cancellationTo
                 {
                     Logger.Trace($"{this.Client.Options.ClientId}-(PW)- ConnectionPublishWriter: Failed to write to transport.");
 
-                    if (this.State == ConnectState.Connected)
+                    // Capture state once to avoid race conditions
+                    var currentState = this.State;
+                    if (currentState == ConnectState.Connected)
                     {
                         // This is an unexpected exit and may be due to a network failure.
                         Logger.Debug($"{this.Client.Options.ClientId}-(PW)- ConnectionPublishWriter: unexpected exit.  Disconnecting...");
@@ -244,7 +246,9 @@ private async Task ConnectionPublishWriterAsync(CancellationToken cancellationTo
                     Logger.Error($"{this.Client.Options.ClientId}-(PW)- Exception: {ex}");
 
                     // Handle exception gracefully - trigger disconnection and exit
-                    if (this.State == ConnectState.Connected)
+                    // Capture state once to avoid race conditions
+                    var currentState = this.State;
+                    if (currentState == ConnectState.Connected)
                     {
                         try
                         {
@@ -344,7 +348,10 @@ private async Task ConnectionWriterAsync(CancellationToken cancellationToken)
                 if (!writeSuccess)
                 {
                     Logger.Error($"{this.Client.Options.ClientId}-(W)- Write failed.  Disconnecting...");
-                    if (this.State == ConnectState.Connected)
+
+                    // Capture state once to avoid race conditions
+                    var currentState = this.State;
+                    if (currentState == ConnectState.Connected)
                     {
                         await this.HandleDisconnectionAsync(false).ConfigureAwait(false);
                     }
@@ -371,7 +378,9 @@ private async Task ConnectionWriterAsync(CancellationToken cancellationToken)
                     Logger.Error($"{this.Client.Options.ClientId}-(W)- Exception: {ex}");
 
                     // Handle exception gracefully - trigger disconnection and exit
-                    if (this.State == ConnectState.Connected)
+                    // Capture state once to avoid race conditions
+                    var currentState = this.State;
+                    if (currentState == ConnectState.Connected)
                     {
                         try
                         {
@@ -408,7 +417,10 @@ private async Task<bool> ConnectionReaderAsync(CancellationToken cancellationTok
                 if (readResult.Failed)
                 {
                     Logger.Debug($"{this.Client.Options.ClientId}-(R)- ConnectionReader exiting: Read from transport failed.");
-                    if (this.State == ConnectState.Connected)
+
+                    // Capture state once to avoid race conditions
+                    var currentState = this.State;
+                    if (currentState == ConnectState.Connected)
                     {
                         await this.HandleDisconnectionAsync(false).ConfigureAwait(false);
                     }
@@ -525,7 +537,9 @@ private async Task<bool> ConnectionReaderAsync(CancellationToken cancellationTok
                     Logger.Error($"{this.Client.Options.ClientId}-(R)- Exception: {ex}");
 
                     // Handle exception gracefully - trigger disconnection and exit
-                    if (this.State == ConnectState.Connected)
+                    // Capture state once to avoid race conditions
+                    var currentState = this.State;
+                    if (currentState == ConnectState.Connected)
                     {
                         try
                         {
@@ -623,7 +637,9 @@ private async Task ReceivedPacketsHandlerAsync(CancellationToken cancellationTok
                     Logger.Error($"{this.Client.Options.ClientId}-(RPH)- Exception: {ex}");
 
                     // Handle exception gracefully - trigger disconnection and exit
-                    if (this.State == ConnectState.Connected)
+                    // Capture state once to avoid race conditions
+                    var currentState = this.State;
+                    if (currentState == ConnectState.Connected)
                     {
                         try
                         {