Merge pull request connamara#951 from gbirchmeier/session-disconnect

SocketInitiatorThread - restore Session disconnect during Read exception

Author: gbirchmeier

QuickFIXn/SocketInitiatorThread.cs

@@ -27,7 +27,6 @@ public class SocketInitiatorThread : IResponder
     private readonly CancellationTokenSource _readCancellationTokenSource = new();
     private readonly IPEndPoint _socketEndPoint;
     private readonly SocketSettings _socketSettings;
-    private bool _isDisconnectRequested = false;
 
     /// <summary>
     /// Keep a task for handling async read
@@ -50,7 +49,6 @@ public SocketInitiatorThread(
 
     public void Start()
     {
-        _isDisconnectRequested = false;
         _thread = new Thread(Transport.SocketInitiator.SocketInitiatorThreadStart);
         _thread.Start(this);
     }
@@ -97,16 +95,9 @@ public bool Read()
             ProcessStream();
             return true;
         }
-        catch (ObjectDisposedException)
-        {
-            // this exception means _socket is already closed when poll() is called
-            if (_isDisconnectRequested == false)
-                Disconnect();
-        }
         catch (Exception e)
         {
-            Session.Log.OnEvent(e.ToString());
-            Disconnect();
+            Session.Disconnect(e.ToString()); // also calls this instance's Disconect()
         }
         return false;
     }
@@ -197,7 +188,6 @@ public bool Send(string data)
 
     public void Disconnect()
     {
-        _isDisconnectRequested = true;
         _readCancellationTokenSource.Cancel();
         _readCancellationTokenSource.Dispose();
 

RELEASE_NOTES.md

@@ -41,6 +41,7 @@ What's New
 * #895 - fix: When SSLCACertificate is empty an error is logged and it fails to start (dckorben)
 * #942 - fix #942: field 369 (LastMsgSeqNumProcessed) wrong in ResendRequest message (gbirchmeier)
 * #940 - Create an alternate CharEncoding.GetBytes impl which uses ArrayPool to improve memory performance (VAllens)
+* #951 - fix: restore Session disconnect during SocketInitiatorThread.Read exception (gbirchmeier/trevor-bush)
 
 ### v1.13.0