Preventing the acceptor session from accepting Logon message when Logout was initiated locally. (#360)

* Preventing the acceptor session from accepting Logon message when Logout was initiated locally.
When Logon sequence was initiated externally. i.e. counterparty initiated Logout sequence, acceptor should still accept subsequent Logon attempts from that counterparty.

Co-authored-by: Janusz Jaskiewicz <janusz.jaskiewicz@capitalmarkets.technology>
Co-authored-by: Christoph John <christoph.john@macd.com>

Author: 3 people

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

@@ -881,9 +881,8 @@ public void reset() {
                     ((ApplicationExtended) application).onBeforeSessionReset(sessionID);
                 }
                 state.setResetStatePending(true);
-                logout("Session reset");
+                generateLogout("Session reset");
                 getLog().onEvent("Initiated logout request");
-                generateLogout(state.getLogoutReason());
             } else {
                 resetState();
             }
@@ -1405,6 +1404,7 @@ private void nextLogout(Message logout) throws IOException, RejectLogon, FieldNo
             return;
         }
 
+        final boolean logoutInitiatedLocally = state.isLogoutSent();
         state.setLogoutReceived(true);
 
         String msg;
@@ -1430,6 +1430,10 @@ private void nextLogout(Message logout) throws IOException, RejectLogon, FieldNo
         }
 
         disconnect(msg, false);
+
+        if (!state.isInitiator() && !logoutInitiatedLocally) {
+            setEnabled(true);
+        }
     }
 
     public void generateLogout() {
@@ -2082,11 +2086,6 @@ public void disconnect(String reason, boolean logError) throws IOException {
                 stateListener.onLogout();
             }
         } finally {
-            // QFJ-457 now enabled again if acceptor
-            if (!state.isInitiator()) {
-                setEnabled(true);
-            }
-
             state.setLogonReceived(false);
             state.setLogonSent(false);
             state.setLogoutSent(false);
@@ -2106,6 +2105,9 @@ public void disconnect(String reason, boolean logError) throws IOException {
     private void nextLogon(Message logon) throws FieldNotFound, RejectLogon, IncorrectDataFormat,
             IncorrectTagValue, UnsupportedMessageType, IOException, InvalidMessage {
 
+        if (!enabled) {
+            throw new RejectLogon("Logon attempt when session is disabled");
+        }
         // QFJ-357
         // If this check is not done here, the Logon would be accepted and
         // immediately followed by a Logout (due to check in Session.next()).

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

@@ -1876,7 +1876,7 @@ public void testNonpersistedGapFill() throws Exception {
 
     @Test
     // QFJ-457
-    public void testAcceptorRelogon() throws Exception {
+    public void testAcceptorRejectsLogonWhenLogoutInitiatedLocally() throws Exception {
         final UnitTestApplication application = new UnitTestApplication();
         try (Session session = setUpSession(application, false,
                 new UnitTestResponder())) {
@@ -1895,13 +1895,40 @@ public void testAcceptorRelogon() throws Exception {
                     UtcTimestampConverter.convert(LocalDateTime.now(ZoneOffset.UTC), UtcTimestampPrecision.SECONDS));
             logout.getHeader().setInt(MsgSeqNum.FIELD, 2);
             session.next(logout);
-            
-            // session.reset();
+
+            assertFalse(session.isEnabled());
             assertFalse(session.isLoggedOn());
             logonTo(session, 3);
             Message lastToAdminMessage = application.lastToAdminMessage();
-            assertNotEquals(Logout.MSGTYPE, lastToAdminMessage.getHeader()
-                    .getString(MsgType.FIELD));
+            assertEquals(Logout.MSGTYPE, lastToAdminMessage.getHeader().getString(MsgType.FIELD));
+        }
+    }
+
+    @Test
+    public void testAcceptorAcceptsLogonWhenLogoutInitiatedExternally() throws Exception {
+        final UnitTestApplication application = new UnitTestApplication();
+        try (Session session = setUpSession(application, false,
+                new UnitTestResponder())) {
+
+            logonTo(session);
+            assertTrue(session.isEnabled());
+            assertTrue(session.isLoggedOn());
+
+            final Message logout = new Logout();
+            logout.getHeader().setString(SenderCompID.FIELD, "TARGET");
+            logout.getHeader().setString(TargetCompID.FIELD, "SENDER");
+            logout.getHeader().setString(SendingTime.FIELD,
+                    UtcTimestampConverter.convert(LocalDateTime.now(ZoneOffset.UTC), UtcTimestampPrecision.SECONDS));
+            logout.getHeader().setInt(MsgSeqNum.FIELD, 2);
+            session.next(logout);
+
+            session.next();
+
+            assertTrue(session.isEnabled());
+            assertFalse(session.isLoggedOn());
+            logonTo(session, 3);
+            Message lastToAdminMessage = application.lastToAdminMessage();
+            assertEquals(Logon.MSGTYPE, lastToAdminMessage.getHeader().getString(MsgType.FIELD));
         }
     }
 

quickfixj-core/src/test/java/quickfix/mina/SessionConnectorTest.java

@@ -99,8 +99,8 @@ public void testConnector() throws Exception {
 
             assertTrue(session.isEnabled());
             connector.logoutAllSessions(true);
-            // Acceptors should get re-enabled after Logout
-            assertTrue(session.isEnabled());
+            // Acceptors should not get re-enabled after initiating Logout
+            assertFalse(session.isEnabled());
 
             assertEquals(9999, connector.getIntSetting(Acceptor.SETTING_SOCKET_ACCEPT_PORT));