Merge branch 'martinadams-issue_#280'

noreentry · Jul 17, 2015 · 2148c0b · 2148c0b
2 parents 4c298a0 + e2526d2
commit 2148c0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/NEXT_VERSION.md b/NEXT_VERSION.md
@@ -38,6 +38,7 @@ Changes since the last version (oldest first):
 * (patch) #283 - fix to ensure IApplication.FromAdmin() gets called for received resend requests (martinadams)
 * (minor) #312 - New config option: can force session-level rejects to be resent (martinadams)
 * (minor) #270/#146 - Correct rejection behavior when msg groups do not use correct delimiter tag (gbirchmeier)
+* (patch) #280 - fix to prevent StackOverflowException due to recursion (martinadams)
 
 
 NOTE: Breaking changes in next release

diff --git a/QuickFIXn/Session.cs b/QuickFIXn/Session.cs
@@ -507,6 +507,16 @@ public void Next()
         /// </summary>
         /// <param name="msgStr"></param>
         public void Next(string msgStr)
+        {
+            NextMessage(msgStr);
+            NextQueued();
+        }
+
+        /// <summary>
+        /// Process a message (in string form) from the counterparty
+        /// </summary>
+        /// <param name="msgStr"></param>
+        private void NextMessage(string msgStr)
         {
             this.Log.OnIncoming(msgStr);
 
@@ -657,7 +667,6 @@ internal void Next(MessageBuilder msgBuilder)
                 Disconnect(e.ToString());
             }
 
-            NextQueued();
             Next();
         }
 
@@ -713,7 +722,6 @@ protected void NextLogon(Message logon)
             else
             {
                 state_.IncrNextTargetMsgSeqNum();
-                NextQueued();
             }
 
             if (this.IsLoggedOn)
@@ -726,7 +734,6 @@ protected void NextTestRequest(Message testRequest)
                 return;
             GenerateHeartbeat(testRequest);
             state_.IncrNextTargetMsgSeqNum();
-            NextQueued();
         }
 
         protected void NextResendRequest(Message resendReq)
@@ -871,7 +878,6 @@ protected void NextHeartbeat(Message heartbeat)
             if (!Verify(heartbeat))
                 return;
             state_.IncrNextTargetMsgSeqNum();
-            NextQueued();
         }
 
         protected void NextSequenceReset(Message sequenceReset)
@@ -1573,15 +1579,13 @@ protected bool NextQueued(int num)
                 }
                 else
                 {
-                    Next(msg.ToString());
+                    NextMessage(msg.ToString());
                 }
                 return true;
             }
             return false;
         }
 
-
-
         private bool IsAdminMessage(Message msg)
         {
             var msgType = msg.Header.GetString(Fields.Tags.MsgType);