Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-02 16:38:10 +02:00
Code Issues Projects Releases Wiki Activity

Always close HikariDataSource

Browse Source
This commit is contained in:
Risto Lahtela 2020-08-30 21:09:59 +03:00
parent 8e86a702eb
commit f6f98c366f
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plan/common/src/main/java/com/djrapitops/plan/storage/database/MySQLDB.java
View File

@ -35,7 +35,6 @@ import dagger.Lazy;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
@ -49,7 +48,7 @@ public class MySQLDB extends SQLDB {
private static int increment = 1;
protected DataSource dataSource;
protected HikariDataSource dataSource;
@Inject
public MySQLDB(
@ -128,9 +127,7 @@ public class MySQLDB extends SQLDB {
Connection connection = dataSource.getConnection();
if (!connection.isValid(5)) {
connection.close();
if (dataSource instanceof HikariDataSource) {
((HikariDataSource) dataSource).close();
}
if (dataSource != null) dataSource.close();
try {
setupDataSource();
// get new connection after restarting pool
@ -147,9 +144,7 @@ public class MySQLDB extends SQLDB {
public void close() {
super.close();
if (dataSource instanceof HikariDataSource) {
((HikariDataSource) dataSource).close();
}
if (dataSource != null) dataSource.close();
}
@Override