diff --git a/Mage.Server/src/main/java/mage/server/AuthorizedUserRepository.java b/Mage.Server/src/main/java/mage/server/AuthorizedUserRepository.java index 9526cc52c99..cce4b1eef1f 100644 --- a/Mage.Server/src/main/java/mage/server/AuthorizedUserRepository.java +++ b/Mage.Server/src/main/java/mage/server/AuthorizedUserRepository.java @@ -117,7 +117,7 @@ public class AuthorizedUserRepository { try { if (usersDao != null && usersDao.getConnectionSource() != null) { DatabaseConnection conn = usersDao.getConnectionSource().getReadWriteConnection(usersDao.getTableName()); - conn.executeStatement("SHUTDOWN IMMEDIATELY", 0); + conn.executeStatement("SHUTDOWN IMMEDIATELY", DatabaseConnection.DEFAULT_RESULT_FLAGS); usersDao.getConnectionSource().releaseConnection(conn); } } catch (SQLException ex) { diff --git a/Mage.Server/src/main/java/mage/server/record/TableRecordRepository.java b/Mage.Server/src/main/java/mage/server/record/TableRecordRepository.java index 13acb082c1d..d0246b364ac 100644 --- a/Mage.Server/src/main/java/mage/server/record/TableRecordRepository.java +++ b/Mage.Server/src/main/java/mage/server/record/TableRecordRepository.java @@ -71,7 +71,7 @@ public enum TableRecordRepository { try { if (recordsDao != null && recordsDao.getConnectionSource() != null) { DatabaseConnection conn = recordsDao.getConnectionSource().getReadWriteConnection(recordsDao.getTableName()); - conn.executeStatement("SHUTDOWN IMMEDIATELY", 0); + conn.executeStatement("SHUTDOWN IMMEDIATELY", DatabaseConnection.DEFAULT_RESULT_FLAGS); recordsDao.getConnectionSource().releaseConnection(conn); } } catch (SQLException ex) { diff --git a/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java b/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java index 5af86d7f035..93137c076b4 100644 --- a/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java +++ b/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java @@ -368,7 +368,7 @@ public enum UserStatsRepository { try { if (statsDao != null && statsDao.getConnectionSource() != null) { DatabaseConnection conn = statsDao.getConnectionSource().getReadWriteConnection(statsDao.getTableName()); - conn.executeStatement("SHUTDOWN IMMEDIATELY", 0); + conn.executeStatement("SHUTDOWN IMMEDIATELY", DatabaseConnection.DEFAULT_RESULT_FLAGS); statsDao.getConnectionSource().releaseConnection(conn); } } catch (SQLException ex) { diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index 523f97f8ebf..4e40dafb74b 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -646,10 +646,17 @@ public enum CardRepository { try { if (cardsDao != null && cardsDao.getConnectionSource() != null) { DatabaseConnection conn = cardsDao.getConnectionSource().getReadWriteConnection(cardsDao.getTableName()); + // TODO: works but generate silent errors in cards.h2.trace.db on app close (maybe new ormlite library version fixed it) + /* + at org.h2.jdbc.JdbcStatement.checkClosed(JdbcStatement.java:1175) + at org.h2.jdbc.JdbcStatement.getUpdateCount(JdbcStatement.java:290) + at com.j256.ormlite.jdbc.JdbcDatabaseConnection.executeStatement(JdbcDatabaseConnection.java:141) + at mage.cards.repository.CardRepository.closeDB(CardRepository.java:651) + */ if (writeCompact) { - conn.executeStatement("SHUTDOWN COMPACT", 0); // compact data and rewrite whole db + conn.executeStatement("SHUTDOWN COMPACT", DatabaseConnection.DEFAULT_RESULT_FLAGS); // compact data and rewrite whole db } else { - conn.executeStatement("SHUTDOWN IMMEDIATELY", 0); // close without any writes + conn.executeStatement("SHUTDOWN IMMEDIATELY", DatabaseConnection.DEFAULT_RESULT_FLAGS); // close without any writes } cardsDao.getConnectionSource().releaseConnection(conn); }