From 40585d70b2592e425e9ad6a90650b24b786108ed Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Fri, 16 Nov 2018 19:27:04 +0200 Subject: [PATCH] Removed volatile from MySQL dataSource Made getConnection synchronized on MySQL --- .../plan/system/database/databases/sql/MySQLDB.java | 4 ++-- .../plan/system/database/databases/sql/SpongeMySQLDB.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/MySQLDB.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/MySQLDB.java index 88fbd4725..d666ee9be 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/MySQLDB.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/MySQLDB.java @@ -48,7 +48,7 @@ public class MySQLDB extends SQLDB { private static int increment = 1; - protected volatile DataSource dataSource; + protected DataSource dataSource; @Inject public MySQLDB( @@ -114,7 +114,7 @@ public class MySQLDB extends SQLDB { } @Override - public Connection getConnection() throws SQLException { + public synchronized Connection getConnection() throws SQLException { Connection connection = dataSource.getConnection(); if (!connection.isValid(5)) { connection.close(); diff --git a/Plan/sponge/src/main/java/com/djrapitops/plan/system/database/databases/sql/SpongeMySQLDB.java b/Plan/sponge/src/main/java/com/djrapitops/plan/system/database/databases/sql/SpongeMySQLDB.java index 566043794..d2d34e2ca 100644 --- a/Plan/sponge/src/main/java/com/djrapitops/plan/system/database/databases/sql/SpongeMySQLDB.java +++ b/Plan/sponge/src/main/java/com/djrapitops/plan/system/database/databases/sql/SpongeMySQLDB.java @@ -85,7 +85,7 @@ public class SpongeMySQLDB extends MySQLDB { } @Override - public Connection getConnection() throws SQLException { + public synchronized Connection getConnection() throws SQLException { try { return super.getConnection(); } catch (SQLException e) {