@@ -209,9 +209,9 @@ func (s *session) sendLogonInReplyTo(setResetSeqNum bool, inReplyTo *Message) er
209209 return nil
210210}
211211
212- func (session * session ) generateSequenceReset (beginSeqNo int , endSeqNo int , inReplyTo Message ) (err error ) {
212+ func (s * session ) generateSequenceReset (beginSeqNo int , endSeqNo int , inReplyTo Message ) (err error ) {
213213 sequenceReset := NewMessage ()
214- session .fillDefaultHeader (sequenceReset , & inReplyTo )
214+ s .fillDefaultHeader (sequenceReset , & inReplyTo )
215215
216216 sequenceReset .Header .SetField (tagMsgType , FIXString ("4" ))
217217 sequenceReset .Header .SetField (tagMsgSeqNum , FIXInt (beginSeqNo ))
@@ -224,12 +224,12 @@ func (session *session) generateSequenceReset(beginSeqNo int, endSeqNo int, inRe
224224 sequenceReset .Header .SetField (tagOrigSendingTime , origSendingTime )
225225 }
226226
227- session .application .ToAdmin (sequenceReset , session .sessionID )
227+ s .application .ToAdmin (sequenceReset , s .sessionID )
228228
229229 msgBytes := sequenceReset .build ()
230230
231- session .EnqueueBytesAndSend (msgBytes )
232- session .log .OnEventf ("Sent SequenceReset TO: %v" , endSeqNo )
231+ s .EnqueueBytesAndSend (msgBytes )
232+ s .log .OnEventf ("Sent SequenceReset TO: %v" , endSeqNo )
233233
234234 return
235235}
@@ -549,19 +549,19 @@ func (s *session) handleLogon(msg *Message) error {
549549
550550 // Evaluate tag 789 to see if we end up with an implied gapfill/resend.
551551 if s .EnableNextExpectedMsgSeqNum && ! msg .Body .Has (tagResetSeqNumFlag ) {
552- targetWantsNextSeqNumToBe , getErr := msg .Body .GetInt (tagNextExpectedMsgSeqNum )
553- if getErr == nil {
554- if targetWantsNextSeqNumToBe != nextSenderMsgNumAtLogonReceived {
555- if ! s .DisableMessagePersist {
556- seqResetErr := s .generateSequenceReset (targetWantsNextSeqNumToBe , nextSenderMsgNumAtLogonReceived + 1 , * msg )
557- if seqResetErr != nil {
558- return seqResetErr
559- }
560- } else {
561- return targetTooHigh {ReceivedTarget : targetWantsNextSeqNumToBe , ExpectedTarget : nextSenderMsgNumAtLogonReceived }
562- }
552+ targetWantsNextSeqNumToBe , getErr := msg .Body .GetInt (tagNextExpectedMsgSeqNum )
553+ if getErr == nil {
554+ if targetWantsNextSeqNumToBe != nextSenderMsgNumAtLogonReceived {
555+ if ! s .DisableMessagePersist {
556+ seqResetErr := s .generateSequenceReset (targetWantsNextSeqNumToBe , nextSenderMsgNumAtLogonReceived + 1 , * msg )
557+ if seqResetErr != nil {
558+ return seqResetErr
563559 }
560+ } else {
561+ return targetTooHigh {ReceivedTarget : targetWantsNextSeqNumToBe , ExpectedTarget : nextSenderMsgNumAtLogonReceived }
562+ }
564563 }
564+ }
565565 }
566566
567567 if err := s .checkTargetTooHigh (msg ); err != nil {
0 commit comments