Skip to content

ResetOnLogon/ResetOnLogout/ResetOnDisconnect fails when PersistMessages is set to 'N' #316

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 6 commits into from
Sep 24, 2021
Merged

ResetOnLogon/ResetOnLogout/ResetOnDisconnect fails when PersistMessages is set to 'N' #316

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50be552
#314 ResetOnLogon/ResetOnLogout/ResetOnDisconnect fails when PersistM…
dparui Sep 23, 2020
1939d88
#314 Unit test
dparui Sep 23, 2020
e590079
#314: ResetOnLogon/ResetOnLogout/ResetOnDisconnect fails when Persist…
dparui Sep 6, 2021
f4a0d55
#314: ResetOnLogon/ResetOnLogout/ResetOnDisconnect fails when Persist…
dparui Sep 6, 2021
61c5cd8
#314: ResetOnLogon/ResetOnLogout/ResetOnDisconnect fails when Persist…
dparui Sep 21, 2021
b5d6416
minor formatting change
chrjohn Sep 23, 2021
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
12 changes: 9 additions & 3 deletions quickfixj-core/src/main/java/quickfix/JdbcStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class JdbcStore implements MessageStore {
private final String sessionTableName;
private final String messageTableName;
private final String defaultSessionIdPropertyValue;
private final boolean persistMessages;

private String SQL_UPDATE_SEQNUMS;
private String SQL_INSERT_SESSION;
Expand Down Expand Up @@ -74,6 +75,9 @@ public JdbcStore(SessionSettings settings, SessionID sessionID, DataSource ds) t
defaultSessionIdPropertyValue = SessionID.NOT_SET;
}

persistMessages = !settings.isSetting(sessionID, Session.SETTING_PERSIST_MESSAGES) ||
settings.getBool(sessionID, Session.SETTING_PERSIST_MESSAGES);

dataSource = ds == null ? JdbcUtil.getDataSource(settings, sessionID) : ds;

// One table is sampled for the extended session ID columns. Be sure
Expand Down Expand Up @@ -180,9 +184,11 @@ public void reset() throws IOException {
PreparedStatement updateTime = null;
try {
connection = dataSource.getConnection();
deleteMessages = connection.prepareStatement(SQL_DELETE_MESSAGES);
setSessionIdParameters(deleteMessages, 1);
deleteMessages.execute();
if (persistMessages) {
deleteMessages = connection.prepareStatement(SQL_DELETE_MESSAGES);
setSessionIdParameters(deleteMessages, 1);
deleteMessages.execute();
}

updateTime = connection.prepareStatement(SQL_UPDATE_SESSION);
updateTime.setTimestamp(1, new Timestamp(Calendar.getInstance(
Expand Down