Skip to content

Commit 9c1edb2

Browse files
authored
Merge pull request #1236 from quickfix-j/chrjohn-patch-1
Validate sequence number in `nextReject()`
2 parents 4f61818 + db22a94 commit 9c1edb2

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

quickfixj-core/src/main/java/quickfix/Session.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ private boolean resetOrDisconnectIfRequired(Message msg) {
13131313

13141314
private void nextReject(Message reject) throws FieldNotFound, RejectLogon, IncorrectDataFormat,
13151315
IncorrectTagValue, UnsupportedMessageType, IOException, InvalidMessage {
1316-
if (!verify(reject, false, validateSequenceNumbers)) {
1316+
if (!verify(reject, validateSequenceNumbers, validateSequenceNumbers)) {
13171317
return;
13181318
}
13191319
if (getExpectedTargetNum() == reject.getHeader().getInt(MsgSeqNum.FIELD)) {

quickfixj-core/src/test/java/quickfix/SessionTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,15 +478,16 @@ public void testRejectMsgSeqNumTooHighOrLow() throws Exception {
478478
assertEquals(2, state.getNextSenderMsgSeqNum());
479479
assertEquals(2, state.getNextTargetMsgSeqNum());
480480

481-
processMessage(session, createReject(2, 100));
482-
assertEquals(3, state.getNextTargetMsgSeqNum());
483-
484481
// Reject with unexpected seqnum should not increment target seqnum
485482
processMessage(session, createReject(50, 100));
486-
assertEquals(3, state.getNextTargetMsgSeqNum());
483+
assertEquals(2, state.getNextTargetMsgSeqNum());
487484

488485
// Reject with unexpected seqnum should not increment target seqnum
489486
processMessage(session, createReject(1, 100));
487+
assertEquals(2, state.getNextTargetMsgSeqNum());
488+
489+
// Reject with expected seqnum should increment target seqnum
490+
processMessage(session, createReject(2, 100));
490491
assertEquals(3, state.getNextTargetMsgSeqNum());
491492
}
492493
}

0 commit comments

Comments
 (0)