Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-30 12:29:16 +00:00
Code Issues Releases Activity

fix: additional null checks

Browse Source
This commit is contained in:
Craftinators
2023-02-27 15:34:42 -05:00
parent 2bf5280827
commit 23c82cc6ed
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/MySQLData.java
View File

@@ -4,6 +4,7 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
import com.hibiscusmc.hmccosmetics.config.DatabaseSettings;
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.sql.*;
import java.util.Properties;
@@ -18,6 +19,7 @@ public class MySQLData extends SQLData {
private String password;
private int port;
@Nullable
private Connection connection;
@Override
@@ -73,7 +75,7 @@ public class MySQLData extends SQLData {
try {
if (isConnectionOpen()) {
return;
} else close(); // Close connection if still active
} else if (connection != null) close(); // Close connection if still active
} catch (RuntimeException e) {
e.printStackTrace(); // If isConnectionOpen() throws error
}
@@ -92,8 +94,9 @@ public class MySQLData extends SQLData {
public void close() {
Bukkit.getScheduler().runTaskAsynchronously(HMCCosmeticsPlugin.getInstance(), () -> {
try {
if (connection == null) throw new NullPointerException();
connection.close();
} catch (SQLException e) {
} catch (SQLException | NullPointerException e) {
System.out.println(e.getMessage());
}
});
@@ -125,8 +128,9 @@ public class MySQLData extends SQLData {
}
try {
if (connection == null) throw new NullPointerException();
ps = connection.prepareStatement(query);
} catch (SQLException e) {
} catch (SQLException | NullPointerException e) {
e.printStackTrace();
}