From 70dfa47669354c04b69c4a098ef711d5c926ea29 Mon Sep 17 00:00:00 2001
From: Grant Birchmeier <gbirchmeier@connamara.com>
Date: Mon, 8 Jun 2015 16:10:31 -0500
Subject: [PATCH] (#80) acceptor shouldn't include 141=Y in logon responses

---
 AcceptanceTest/definitions/server/fix44/SessionReset.def      | 4 ++--
 .../server/fix44noreset/SessionResetAfterDisconnect.def       | 4 ++--
 AcceptanceTest/definitions/server/fix50/SessionReset.def      | 4 ++--
 AcceptanceTest/definitions/server/fix50sp1/SessionReset.def   | 4 ++--
 AcceptanceTest/definitions/server/fix50sp2/SessionReset.def   | 4 ++--
 NEXT_VERSION.md                                               | 2 +-
 QuickFIXn/Session.cs                                          | 2 --
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/AcceptanceTest/definitions/server/fix44/SessionReset.def b/AcceptanceTest/definitions/server/fix44/SessionReset.def
index f6ddf7831..18237f473 100644
--- a/AcceptanceTest/definitions/server/fix44/SessionReset.def
+++ b/AcceptanceTest/definitions/server/fix44/SessionReset.def
@@ -20,7 +20,7 @@ E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIX.4.4
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIX.4.4
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.4
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
\ No newline at end of file
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def b/AcceptanceTest/definitions/server/fix44noreset/SessionResetAfterDisconnect.def
index 6b22775ab..62f536817 100644
--- 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.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

-E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

 I8=FIX.4.4
35=0
34=2
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 I8=FIX.4.4
35=0
34=4
49=TW
52=<TIME>
56=ISLD

@@ -27,7 +27,7 @@ iCONNECT
 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIX.4.4
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIX.4.4
9=67
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
10=0

+E8=FIX.4.4
9=61
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIX.4.4
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

diff --git a/AcceptanceTest/definitions/server/fix50/SessionReset.def b/AcceptanceTest/definitions/server/fix50/SessionReset.def
index 383ee0e2b..41827d021 100644
--- a/AcceptanceTest/definitions/server/fix50/SessionReset.def
+++ b/AcceptanceTest/definitions/server/fix50/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=7

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=7
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=7
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
\ No newline at end of file
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def b/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def
index bc14acc50..520c31fd8 100644
--- a/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def
+++ b/AcceptanceTest/definitions/server/fix50sp1/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=8

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=8
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=8
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
\ No newline at end of file
+eDISCONNECT
diff --git a/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def b/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def
index 066ea59f1..9564c629f 100644
--- a/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def
+++ b/AcceptanceTest/definitions/server/fix50sp2/SessionReset.def
@@ -21,7 +21,7 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 #send a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
141=Y
1137=9

 #Expect a response with a Logon with ResetSeqNumFlag set to Y and with MsgSeqNum of 1.
-E8=FIXT.1.1
9=74
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
141=Y
1137=9
10=0

+E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
1137=9
10=0

 
 #Send TestRequest (MsgSeqNum = 2) expect to receive HeartBeat (MsgSeqNum = 2)
 I8=FIXT.1.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=1

@@ -31,4 +31,4 @@ E8=FIXT.1.1
9=55
35=0
34=2
49=ISLD
52=<TIME>
56=TW
112=1

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 
-eDISCONNECT
\ No newline at end of file
+eDISCONNECT
diff --git a/NEXT_VERSION.md b/NEXT_VERSION.md
index e53358af0..a163a3c78 100644
--- 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
index 0386f13a4..0af37987a 100755
--- 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)));