Skip to content

Re-enabled acceptor sessions in finally block #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2017
Merged

Re-enabled acceptor sessions in finally block #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22ad9e0
Re-enabled acceptor sessions in finally block
upchuck Jul 19, 2017
de53592
Re-enabled acceptor sessions in finally block
chrjohn Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion quickfixj-core/src/main/java/quickfix/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1986,11 +1986,12 @@ public void disconnect(String reason, boolean logError) throws IOException {

stateListener.onLogout();
}
} finally {
// QFJ-457 now enabled again if acceptor
if (!state.isInitiator()) {
setEnabled(true);
}
} finally {
state.setLogonReceived(false);
state.setLogonSent(false);
state.setLogoutSent(false);
Expand Down
3 changes: 2 additions & 1 deletion quickfixj-core/src/test/java/quickfix/mina/SessionConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public void testConnector() throws Exception {

assertTrue(session.isEnabled());
connector.logoutAllSessions(true);
assertFalse(session.isEnabled());
// Acceptors should get re-enabled after Logout
assertTrue(session.isEnabled());

assertEquals(9999, connector.getIntSetting(Acceptor.SETTING_SOCKET_ACCEPT_PORT));

Expand Down