Merge pull request #984 from gbirchmeier/978finally

gbirchmeier · web-flow · commit a32a2c1965e3 · 2025-10-22T15:15:55.000-05:00
(#978 fix) delete redundant lines in SocketInitiatorThreadStart
diff --git a/QuickFIXn/Transport/SocketInitiator.cs b/QuickFIXn/Transport/SocketInitiator.cs
@@ -60,10 +60,6 @@ public static void SocketInitiatorThreadStart(object? socketInitiatorThread)
                 t.Session.Next();
                 while (t.Read()) {
                 }
-
-                if (t.Initiator.IsStopped)
-                    t.Initiator.RemoveThread(t);
-                t.Initiator.SetDisconnected(t.Session.SessionID);
             }
             catch (IOException ex) // Can be exception when connecting, during ssl authentication or when reading
             {
@@ -81,11 +77,9 @@ public static void SocketInitiatorThreadStart(object? socketInitiatorThread)
             {
                 LogThreadStartConnectionFailed(t, ex);
             }
-            finally
-            {
-                t.Initiator.RemoveThread(t);
-                t.Initiator.SetDisconnected(t.Session.SessionID);
-            }
+
+            t.Initiator.RemoveThread(t);
+            t.Initiator.SetDisconnected(t.Session.SessionID);
         }
 
         private static void LogThreadStartConnectionFailed(SocketInitiatorThread t, Exception e) {
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -60,6 +60,7 @@ What's New
 * #309 - fix: obey a SeqReset-GapFill even if it 'replaces' a message that was processed off
          queue in a ResendRequest series (gbirchmeier/oclancy)
 * #979 - improve DDTool: nullable enable, custom name, generate csproj if needed (gbirchmeier)
+* #978 - delete some redundant lines in SocketInitiatorThreadStart (gbirchmeier)
 
 ### v1.13.1
 * backport #951 to 1.13

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,6 @@ public static void SocketInitiatorThreadStart(object? socketInitiatorThread)`
`60`	`60`	`t.Session.Next();`
`61`	`61`	`while (t.Read()) {`
`62`	`62`	`}`
`63`		`-`
`64`		`- if (t.Initiator.IsStopped)`
`65`		`- t.Initiator.RemoveThread(t);`
`66`		`- t.Initiator.SetDisconnected(t.Session.SessionID);`
`67`	`63`	`}`
`68`	`64`	`catch (IOException ex) // Can be exception when connecting, during ssl authentication or when reading`
`69`	`65`	`{`
`@@ -81,11 +77,9 @@ public static void SocketInitiatorThreadStart(object? socketInitiatorThread)`
`81`	`77`	`{`
`82`	`78`	`LogThreadStartConnectionFailed(t, ex);`
`83`	`79`	`}`
`84`		`- finally`
`85`		`- {`
`86`		`- t.Initiator.RemoveThread(t);`
`87`		`- t.Initiator.SetDisconnected(t.Session.SessionID);`
`88`		`- }`
	`80`	`+`
	`81`	`+ t.Initiator.RemoveThread(t);`
	`82`	`+ t.Initiator.SetDisconnected(t.Session.SessionID);`
`89`	`83`	`}`
`90`	`84`
`91`	`85`	`private static void LogThreadStartConnectionFailed(SocketInitiatorThread t, Exception e) {`