(connamara#80) acceptor shouldn't include 141=Y in logon responses

gbirchmeier · Jun 8, 2015 · fb2f776 · fb2f776
1 parent fdfe748
commit fb2f776
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/AcceptanceTest/definitions/server/fix44/SessionReset.def b/AcceptanceTest/definitions/server/fix44/SessionReset.def
@@ -20,7 +20,7 @@ E8=FIX.4.49=5535=034=249=ISLD52=<TIME>56=TW112=1
 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIX.4.435=A34=149=TW52=<TIME>56=ISLD98=0108=30141=Y
 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIX.4.49=6735=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=30141=Y10=0
+E8=FIX.4.49=6135=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=3010=0
 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIX.4.435=134=249=TW52=<TIME>56=ISLD112=1
@@ -31,4 +31,4 @@ E8=FIX.4.49=5535=034=249=ISLD52=<TIME>56=TW112=1
 I8=FIX.4.435=534=349=TW52=<TIME>56=ISLD
 E8=FIX.4.49=4935=534=349=ISLD52=00000000-00:00:00.00056=TW10=0
 
-eDISCONNECT
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def b/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def
@@ -3,7 +3,7 @@
 iCONNECT
 # logon with reset, because this config has ResetOnLogon=N
 I8=FIX.4.435=A34=149=TW52=<TIME>56=ISLD98=0108=30141=Y
-E8=FIX.4.49=6735=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=30141=Y10=0
+E8=FIX.4.49=6135=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=3010=0
 I8=FIX.4.435=034=249=TW52=<TIME>56=ISLD
 I8=FIX.4.435=034=349=TW52=<TIME>56=ISLD
 I8=FIX.4.435=034=449=TW52=<TIME>56=ISLD
@@ -27,7 +27,7 @@ iCONNECT
 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIX.4.435=A34=149=TW52=<TIME>56=ISLD98=0108=30141=Y
 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIX.4.49=6735=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=30141=Y10=0
+E8=FIX.4.49=6135=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=3010=0
 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIX.4.435=134=249=TW52=<TIME>56=ISLD112=1

diff --git a/AcceptanceTest/definitions/server/fix50/SessionReset.def b/AcceptanceTest/definitions/server/fix50/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.19=5535=034=249=ISLD52=<TIME>56=TW112=1
 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.135=A34=149=TW52=<TIME>56=ISLD98=0108=30141=Y1137=7
 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.19=7435=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=30141=Y1137=710=0
+E8=FIXT.1.19=6835=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=301137=710=0
 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.135=134=249=TW52=<TIME>56=ISLD112=1
@@ -31,4 +31,4 @@ E8=FIXT.1.19=5535=034=249=ISLD52=<TIME>56=TW112=1
 I8=FIXT.1.135=534=349=TW52=<TIME>56=ISLD
 E8=FIXT.1.19=4935=534=349=ISLD52=00000000-00:00:00.00056=TW10=0
 
-eDISCONNECT
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def b/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.19=5535=034=249=ISLD52=<TIME>56=TW112=1
 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.135=A34=149=TW52=<TIME>56=ISLD98=0108=30141=Y1137=8
 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.19=7435=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=30141=Y1137=810=0
+E8=FIXT.1.19=6835=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=301137=810=0
 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.135=134=249=TW52=<TIME>56=ISLD112=1
@@ -31,4 +31,4 @@ E8=FIXT.1.19=5535=034=249=ISLD52=<TIME>56=TW112=1
 I8=FIXT.1.135=534=349=TW52=<TIME>56=ISLD
 E8=FIXT.1.19=4935=534=349=ISLD52=00000000-00:00:00.00056=TW10=0
 
-eDISCONNECT
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def b/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.19=5535=034=249=ISLD52=<TIME>56=TW112=1
 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.135=A34=149=TW52=<TIME>56=ISLD98=0108=30141=Y1137=9
 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.19=7435=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=30141=Y1137=910=0
+E8=FIXT.1.19=6835=A34=149=ISLD52=00000000-00:00:00.00056=TW98=0108=301137=910=0
 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.135=134=249=TW52=<TIME>56=ISLD112=1
@@ -31,4 +31,4 @@ E8=FIXT.1.19=5535=034=249=ISLD52=<TIME>56=TW112=1
 I8=FIXT.1.135=534=349=TW52=<TIME>56=ISLD
 E8=FIXT.1.19=4935=534=349=ISLD52=00000000-00:00:00.00056=TW10=0
 
-eDISCONNECT
+eDISCONNECT
diff --git a/NEXT_VERSION.md b/NEXT_VERSION.md
@@ -29,5 +29,5 @@ Changes since the last version (oldest first):
 * (patch) #275 - SessionID.IsSet() should be used instead of !=SessionID.NOT_SET (akamyshanov)
 * (patch) #297 - revert #287
 * (patch) #290 - support for RefreshOnLogon (martinadams)
-
+* (patch)  #80 - fixes to tag-141-related sequence resets (TomasVetrovsky,akamyshanov,gbirchmeier)
 
diff --git a/QuickFIXn/Session.cs b/QuickFIXn/Session.cs
@@ -1241,8 +1241,6 @@ protected bool GenerateLogon(Message otherLogon)
             logon.SetField(new Fields.EncryptMethod(0));
             if (this.SessionID.IsFIXT)
                 logon.SetField(new Fields.DefaultApplVerID(this.SenderDefaultApplVerID));
-            if (state_.ReceivedReset)
-                logon.SetField(new Fields.ResetSeqNumFlag(true));
             logon.SetField(new Fields.HeartBtInt(otherLogon.GetInt(Tags.HeartBtInt)));
             if (this.EnableLastMsgSeqNumProcessed)
                 logon.Header.SetField(new Fields.LastMsgSeqNumProcessed(otherLogon.Header.GetInt(Tags.MsgSeqNum)));