Merge pull request connamara#939 from gbirchmeier/session-refactors

minor checkTooHigh/TooLow refactor in Session.cs
mgatny · Feb 20, 2025 · bc2c1d7 · bc2c1d7
2 parents 49990fd + fd4d925
commit bc2c1d7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/QuickFIXn/Session.cs b/QuickFIXn/Session.cs
@@ -897,7 +897,6 @@ protected void NextSequenceReset(Message sequenceReset)
 
         public bool Verify(Message msg, bool checkTooHigh = true, bool checkTooLow = true)
         {
-            SeqNumType msgSeqNum = 0;
             string msgType;
 
             try
@@ -914,33 +913,35 @@ public bool Verify(Message msg, bool checkTooHigh = true, bool checkTooLow = tru
                 }
 
                 if (checkTooHigh || checkTooLow)
-                    msgSeqNum = msg.Header.GetULong(Fields.Tags.MsgSeqNum);
-
-                if (checkTooHigh && IsTargetTooHigh(msgSeqNum))
-                {
-                    DoTargetTooHigh(msg, msgSeqNum);
-                    return false;
-                }
-                if (checkTooLow && IsTargetTooLow(msgSeqNum))
                 {
-                    DoTargetTooLow(msg, msgSeqNum);
-                    return false;
-                }
+                    SeqNumType msgSeqNum = msg.Header.GetULong(Fields.Tags.MsgSeqNum);
 
-                if ((checkTooHigh || checkTooLow) && _state.ResendRequested())
-                {
-                    ResendRange range = _state.GetResendRange();
-                    if (msgSeqNum >= range.EndSeqNo)
+                    if (checkTooHigh && IsTargetTooHigh(msgSeqNum))
                     {
-                        Log.OnEvent("ResendRequest for messages FROM: " + range.BeginSeqNo + " TO: " + range.EndSeqNo + " has been satisfied.");
-                        _state.SetResendRange(0, 0);
+                        DoTargetTooHigh(msg, msgSeqNum);
+                        return false;
                     }
-                    else if (msgSeqNum >= range.ChunkEndSeqNo)
+                    if (checkTooLow && IsTargetTooLow(msgSeqNum))
                     {
-                        Log.OnEvent("Chunked ResendRequest for messages FROM: " + range.BeginSeqNo + " TO: " + range.ChunkEndSeqNo + " has been satisfied.");
-                        SeqNumType newChunkEndSeqNo = Math.Min(range.EndSeqNo, range.ChunkEndSeqNo + MaxMessagesInResendRequest);
-                        GenerateResendRequestRange(msg.Header.GetString(Fields.Tags.BeginString), range.ChunkEndSeqNo + 1, newChunkEndSeqNo);
-                        range.ChunkEndSeqNo = newChunkEndSeqNo;
+                        DoTargetTooLow(msg, msgSeqNum);
+                        return false;
+                    }
+
+                    if (_state.ResendRequested())
+                    {
+                        ResendRange range = _state.GetResendRange();
+                        if (msgSeqNum >= range.EndSeqNo)
+                        {
+                            Log.OnEvent("ResendRequest for messages FROM: " + range.BeginSeqNo + " TO: " + range.EndSeqNo + " has been satisfied.");
+                            _state.SetResendRange(0, 0);
+                        }
+                        else if (msgSeqNum >= range.ChunkEndSeqNo)
+                        {
+                            Log.OnEvent("Chunked ResendRequest for messages FROM: " + range.BeginSeqNo + " TO: " + range.ChunkEndSeqNo + " has been satisfied.");
+                            SeqNumType newChunkEndSeqNo = Math.Min(range.EndSeqNo, range.ChunkEndSeqNo + MaxMessagesInResendRequest);
+                            GenerateResendRequestRange(msg.Header.GetString(Fields.Tags.BeginString), range.ChunkEndSeqNo + 1, newChunkEndSeqNo);
+                            range.ChunkEndSeqNo = newChunkEndSeqNo;
+                        }
                     }
                 }
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -15,7 +15,9 @@ What's New
 * **There are breaking changes between 1.10 and 1.11!  Please review the 1.11.0 notes below.**
 
 ### next release
-* #nnn - placeholder
+
+**Non-breaking changes**
+* #939 - minor checkTooHigh/checkTooLow refactor in Session.cs (gbirchmeier)
 
 ### v1.13.0