Merge branch 'QFJ-803' into message-all

Author: SomeTest1234

quickfixj-core/src/main/doc/usermanual/usage/configuration.html

@@ -94,7 +94,7 @@ <H3>QuickFIX Settings</H3>
   <TR ALIGN="left" VALIGN="middle">
     <TD> <I>BeginString</I> </TD>
     <TD> Version of FIX this session should use </TD>
-    <TD> FIX.4.4 <br> FIX.4.3 <br> FIX.4.2 <br> FIX.4.1 <br> FIX.4.0 </TD>
+    <TD> FIX.4.4 <br> FIX.4.3 <br> FIX.4.2 <br> FIX.4.1 <br> FIX.4.0 <br> FIXT.1.1 (which then requires DefaultApplVerID, see below) </TD>
 
     <TD>&nbsp;</TD>
   </TR>

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

@@ -1294,6 +1294,8 @@ private void nextLogout(Message logout) throws IOException, RejectLogon, FieldNo
             return;
         }
 
+        state.setLogoutReceived(true);
+
         String msg;
         if (!state.isLogoutSent()) {
             msg = "Received logout request";
@@ -1308,8 +1310,6 @@ private void nextLogout(Message logout) throws IOException, RejectLogon, FieldNo
             getLog().onEvent(msg);
         }
 
-        state.setLogoutReceived(true);
-
         // QFJ-750
         if (getExpectedTargetNum() == logout.getHeader().getInt(MsgSeqNum.FIELD)) {
             state.incrNextTargetMsgSeqNum();
@@ -1395,7 +1395,9 @@ private void nextSequenceReset(Message sequenceReset) throws IOException, Reject
                         // which would trigger another resend.
                         final String beginString = sequenceReset.getHeader().getString(
                                 BeginString.FIELD);
-                        sendResendRequest(beginString, range.getEndSeqNo() + 1, newSequence + 1,
+                        // New sequence is the sequence number of the next message that
+                        // should be received, so it must be included in requested range
+                        sendResendRequest(beginString, range.getEndSeqNo() + 1, newSequence,
                                 range.getEndSeqNo());
                     }
                 }

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

@@ -1050,7 +1050,7 @@ public void testSequenceResetStackOverflow() throws Exception {
 
         session.close();
     }
-  
+
     // QFJ-626
     @Test
     public void testResendMessagesWithIncorrectChecksum() throws Exception {
@@ -1952,7 +1952,7 @@ private void testLargeQueue(int N) throws Exception {
 
         /*
          * Logon request was sent to the counterparty.
-         * 
+         *
          * Now we'll receive Logon response with too high sequence number 101
          * instead of 1, which should initiate the resend process. During the
          * resend process the counterparty should send us the missing messages
@@ -1972,7 +1972,7 @@ private void testLargeQueue(int N) throws Exception {
 
         /*
          * We sent a resend request from 1 to 100.
-         * 
+         *
          * The counterpatry quickly responds with a sequence reset from
          * 1 to 100, so we can adjust our expected sequence number value
          * and skip a number of administrative messages that should
@@ -1985,11 +1985,11 @@ private void testLargeQueue(int N) throws Exception {
         /*
          * So, we're still missing the message at sequence 100, which is an
          * application message.
-         * 
+         *
          * Unfortunately the counterparty is very slow in resending
          * application messages, but they will eventually send the
          * message to us.
-         * 
+         *
          * In the meantime they have a temporary burst of real-time data and
          * they send us N (possibly thousands) application messages within a
          * short period of time. All the messages get stored in a temporary
@@ -2003,11 +2003,11 @@ private void testLargeQueue(int N) throws Exception {
         /*
          * Eventually the counterparty sends us the missing application
          * message with sequence number 100.
-         * 
+         *
          * However, depending on the number of messages stored in the
          * temporary queue the queue will be either processed correctly,
          * or the recursive nature of the next()/nextQueued() call will
-         * blow up with a StackOverflowError. 
+         * blow up with a StackOverflowError.
          */
         // Deliver the last missing application message #100.
         session.next(createPossDupAppMessage(100));
@@ -2141,15 +2141,18 @@ private class UnitTestResponder implements Responder {
         public String sentMessageData;
         public boolean disconnectCalled;
 
+        @Override
         public boolean send(String data) {
             sentMessageData = data;
             return true;
         }
 
+        @Override
         public String getRemoteAddress() {
             return null;
         }
 
+        @Override
         public void disconnect() {
             disconnectCalled = true;
         }

quickfixj-core/src/test/resources/quickfix/test/acceptance/definitions/resendRequestChunkSize/fix40/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -19,15 +19,15 @@ E8=FIX.4.0
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

 # Send a GapFill up to the last message 8
 I8=FIX.4.0
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

 
-# Receive Resend request for messages 9 to (9+5-1 = 13)
-E8=FIX.4.0
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

-# Send a GapFill up to the last message 13
-I8=FIX.4.0
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=13

+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.0
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.0
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

 
-# Receive Resend request for messages 14 to 15)
-E8=FIX.4.0
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=999999
10=0

+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.0
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=999999
10=0

 # Send a GapFill up to the last message 15
-I8=FIX.4.0
35=4
34=13
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+I8=FIX.4.0
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

 
 #Sent test request to validate no seq num issue
 I8=FIX.4.0
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

quickfixj-core/src/test/resources/quickfix/test/acceptance/definitions/resendRequestChunkSize/fix41/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -19,20 +19,21 @@ E8=FIX.4.1
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

 # Send a GapFill up to the last message 8
 I8=FIX.4.1
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

 
-# Receive Resend request for messages 9 to (9+5-1 = 13)
-E8=FIX.4.1
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

-# Send a GapFill up to the last message 13
-I8=FIX.4.1
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=13

+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.1
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.1
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

 
-# Receive Resend request for messages 14 to 15)
-E8=FIX.4.1
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=999999
10=0

+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.1
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=999999
10=0

 # Send a GapFill up to the last message 15
-I8=FIX.4.1
35=4
34=13
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+I8=FIX.4.1
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

 
 #Sent test request to validate no seq num issue
 I8=FIX.4.1
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

 E8=FIX.4.1
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

 
+
 # logout message and response
 I8=FIX.4.1
35=5
34=17
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.1
9=45
35=5
34=8
49=ISLD
52=00000000-00:00:00
56=TW
10=0

quickfixj-core/src/test/resources/quickfix/test/acceptance/definitions/resendRequestChunkSize/fix42/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -19,21 +19,21 @@ E8=FIX.4.2
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

 # Send a GapFill up to the last message 8
 I8=FIX.4.2
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

 
-# Receive Resend request for messages 9 to (9+5-1 = 13)
-E8=FIX.4.2
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

-# Send a GapFill up to the last message 13
-I8=FIX.4.2
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=13

+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.2
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.2
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

 
-# Receive Resend request for messages 14 to 15)
-E8=FIX.4.2
9=55
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=0
10=0

+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.2
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

 # Send a GapFill up to the last message 15
-I8=FIX.4.2
35=4
34=13
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

-
+I8=FIX.4.2
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

 
 #Sent test request to validate no seq num issue
 I8=FIX.4.2
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

 E8=FIX.4.2
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

 
+
 # logout message and response
 I8=FIX.4.2
35=5
34=17
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.2
9=45
35=5
34=8
49=ISLD
52=00000000-00:00:00
56=TW
10=0

quickfixj-core/src/test/resources/quickfix/test/acceptance/definitions/resendRequestChunkSize/fix43/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -19,21 +19,21 @@ E8=FIX.4.3
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

 # Send a GapFill up to the last message 8
 I8=FIX.4.3
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

 
-# Receive Resend request for messages 9 to (9+5-1 = 13)
-E8=FIX.4.3
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

-# Send a GapFill up to the last message 13
-I8=FIX.4.3
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=13

+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.3
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.3
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

 
-# Receive Resend request for messages 14 to 15)
-E8=FIX.4.3
9=55
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=0
10=0

+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.3
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

 # Send a GapFill up to the last message 15
-I8=FIX.4.3
35=4
34=13
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

-
+I8=FIX.4.3
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

 
 #Sent test request to validate no seq num issue
 I8=FIX.4.3
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

 E8=FIX.4.3
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

 
+
 # logout message and response
 I8=FIX.4.3
35=5
34=17
49=TW
52=<TIME>
56=ISLD

 E8=FIX.4.3
9=45
35=5
34=8
49=ISLD
52=00000000-00:00:00
56=TW
10=0

quickfixj-core/src/test/resources/quickfix/test/acceptance/definitions/resendRequestChunkSize/fix44/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -19,20 +19,21 @@ E8=FIX.4.4
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

 # Send a GapFill up to the last message 8
 I8=FIX.4.4
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

 
-# Receive Resend request for messages 9 to (9+5-1 = 13)
-E8=FIX.4.4
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

-# Send a GapFill up to the last message 13
-I8=FIX.4.4
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=13

+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIX.4.4
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIX.4.4
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

 
-# Receive Resend request for messages 14 to 15)
-E8=FIX.4.4
9=55
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=0
10=0

+# Receive Resend request for messages 12 to 15)
+E8=FIX.4.4
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

 # Send a GapFill up to the last message 15
-I8=FIX.4.4
35=4
34=13
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+I8=FIX.4.4
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

 
 #Sent test request to validate no seq num issue
 I8=FIX.4.4
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

 E8=FIX.4.4
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

 
+
 # logout message and response
 I8=FIX.4.4
35=5
34=17
49=TW
52=<TIME>
56=ISLD

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

quickfixj-core/src/test/resources/quickfix/test/acceptance/definitions/resendRequestChunkSize/fix50/SequenceGapFollowedBySequenceResetWithGapFill.def

@@ -3,7 +3,7 @@
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=2
1137=7

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

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

 
 I8=FIXT.1.1
35=D
34=2
49=TW
52=<TIME>
56=ISLD
11=ID
21=3
38=100
40=1
54=1
55=INTC
60=<TIME>

 E8=FIXT.1.1
9=81
35=D
34=2
49=ISLD
52=00000000-00:00:00
56=TW
11=ID
21=3
38=100
40=1
54=1
55=INTC
10=0

@@ -19,20 +19,21 @@ E8=FIXT.1.1
9=54
35=2
34=4
49=ISLD
52=00000000-00:00:00
56=TW
7=4
16=8
10=0

 # Send a GapFill up to the last message 8
 I8=FIXT.1.1
35=4
34=4
49=TW
52=<TIME>
56=ISLD
123=Y
36=8

 
-# Receive Resend request for messages 9 to (9+5-1 = 13)
-E8=FIXT.1.1
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=9
16=13
10=0

-# Send a GapFill up to the last message 13
-I8=FIXT.1.1
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=13

+# Receive Resend request for messages 8 to (8+5-1 = 12)
+E8=FIXT.1.1
9=55
35=2
34=5
49=ISLD
52=00000000-00:00:00
56=TW
7=8
16=12
10=0

+# Send a GapFill up to the last message 12
+I8=FIXT.1.1
35=4
34=8
49=TW
52=<TIME>
56=ISLD
123=Y
36=12

 
-# Receive Resend request for messages 14 to 15)
-E8=FIXT.1.1
9=55
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=14
16=0
10=0

+# Receive Resend request for messages 12 to 15)
+E8=FIXT.1.1
9=60
35=2
34=6
49=ISLD
52=00000000-00:00:00
56=TW
7=12
16=0
10=0

 # Send a GapFill up to the last message 15
-I8=FIXT.1.1
35=4
34=13
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

+I8=FIXT.1.1
35=4
34=12
49=TW
52=<TIME>
56=ISLD
123=Y
36=15

 
 #Sent test request to validate no seq num issue
 I8=FIXT.1.1
35=1
34=16
49=TW
52=<TIME>
56=ISLD
112=TEST

 E8=FIXT.1.1
9=54
35=0
34=7
49=ISLD
52=00000000-00:00:00
56=TW
112=TEST
10=0

 
+
 # logout message and response
 I8=FIXT.1.1
35=5
34=17
49=TW
52=<TIME>
56=ISLD

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