クローズするようにしました

SIGMA-L · Sep 5, 2021 · 30216bf · 30216bf
1 parent d938e6e
commit 30216bf
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 16 deletions.
diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/SQLUtil.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/SQLUtil.java
@@ -10,30 +10,41 @@ public class SQLUtil {
     private static Connection connection;
 
     public static String[] getDiscordFromSQL(String uuid) {
+        String[] result = null;
         try {
             PreparedStatement preparedStatement = getSQLConnection().prepareStatement("select * from verifyplayer where uuid = ?");
             preparedStatement.setString(1, uuid);
+
             ResultSet resultSet = preparedStatement.executeQuery();
-            if (resultSet.next()) return new String[]{resultSet.getString(1), resultSet.getString(2)};
+            if (resultSet.next()) result = new String[]{resultSet.getString(1), resultSet.getString(2)};
+
+            preparedStatement.close();
+            //PreparedStatementが閉じたらResultSetは閉じるはず
+
 
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
-        return null;
+        return result;
     }
 
     public static String[] getUUIDFromSQL(String discord) {
+        String[] result = null;
         try {
             PreparedStatement preparedStatement = getSQLConnection().prepareStatement("select * from verifyplayer where discord = ?");
             preparedStatement.setString(1, discord);
 
             ResultSet resultSet = preparedStatement.executeQuery();
-            if (resultSet.next()) return new String[]{resultSet.getString(1), resultSet.getString(2)};
+            if (resultSet.next()) result = new String[]{resultSet.getString(1), resultSet.getString(2)};
+
+            preparedStatement.close();
+            //PreparedStatementが閉じたらResultSetは閉じるはず
+
 
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
-        return null;
+        return result;
     }
 
 

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/SQLiteUtil.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/SQLiteUtil.java
@@ -9,43 +9,56 @@ public class SQLiteUtil {
     private static Connection connection;
 
     public static boolean CheckCode(Integer code) {
+        boolean result = false;
         try {
             PreparedStatement preparedStatement = getSQLiteConnection().prepareStatement("select * from waitverify where code = ?");
             preparedStatement.setString(1, code.toString());
             ResultSet resultSet = preparedStatement.executeQuery();
-            return resultSet.next();
+            if(resultSet.next()) result = true;
+
+            preparedStatement.close();
+            //PreparedStatementが閉じたらResultSetは閉じるはず
+
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
-        return false;
+        return result;
     }
 
     public static String[] getCodeFromSQLite(String uuid) {
+        String[] result = null;
         try {
             PreparedStatement preparedStatement = getSQLiteConnection().prepareStatement("select * from waitverify where uuid = ?");
             preparedStatement.setString(1, uuid);
 
             ResultSet resultSet = preparedStatement.executeQuery();
-            if(resultSet.next()) return new String[] {resultSet.getString(1),resultSet.getString(2)};
+            if(resultSet.next()) result = new String[] {resultSet.getString(1),resultSet.getString(2)};
+
+            preparedStatement.close();
+            //PreparedStatementが閉じたらResultSetは閉じるはず
 
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
-    return null;
+    return result;
     }
 
     public static String[] getUUIDFromSQLite(String code) {
+        String[] result = null;
         try {
             PreparedStatement preparedStatement = getSQLiteConnection().prepareStatement("select * from waitverify where code = ?");
             preparedStatement.setString(1, code);
 
             ResultSet resultSet = preparedStatement.executeQuery();
-            if(resultSet.next()) return new String[] {resultSet.getString(1),resultSet.getString(2)};
+            if(resultSet.next()) result = new String[] {resultSet.getString(1),resultSet.getString(2)};
+
+            preparedStatement.close();
+            //PreparedStatementが閉じたらResultSetは閉じるはず
 
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
-        return null;
+        return result;
     }
 
     public static void putSQLite(String uuid, String code) {

diff --git a/...CheckerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Util/SQLUtil.java b/...CheckerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Util/SQLUtil.java
@@ -11,31 +11,39 @@ public class SQLUtil {
     private static Connection connection;
 
     public static String[] getDiscordFromSQL(String uuid) {
+        String[] result = null;
         try {
             PreparedStatement preparedStatement = getSQLConnection().prepareStatement("select * from verifyplayer where uuid = ?");
             preparedStatement.setString(1, uuid);
 
             ResultSet resultSet = preparedStatement.executeQuery();
-            if (resultSet.next()) return new String[]{resultSet.getString(1), resultSet.getString(2)};
+            if (resultSet.next()) result = new String[]{resultSet.getString(1), resultSet.getString(2)};
+
+            preparedStatement.close();
+            //PreparedStatementが閉じたらResultSetは閉じるはず
 
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
-        return null;
+        return result;
     }
 
     public static String[] getUUIDFromSQL(String discord) {
+        String[] result = null;
         try {
             PreparedStatement preparedStatement = getSQLConnection().prepareStatement("select * from verifyplayer where discord = ?");
             preparedStatement.setString(1, discord);
 
             ResultSet resultSet = preparedStatement.executeQuery();
-            if (resultSet.next()) return new String[]{resultSet.getString(1), resultSet.getString(2)};
+            if (resultSet.next()) result = new String[]{resultSet.getString(1), resultSet.getString(2)};
+
+            preparedStatement.close();
+            //PreparedStatementが閉じたらResultSetは閉じるはず
 
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
-        return null;
+        return result;
     }
 
     public static void putSQL(String uuid, String discord) {

diff --git a/...ckerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Util/SQLiteUtil.java b/...ckerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Util/SQLiteUtil.java
@@ -10,17 +10,21 @@ public class SQLiteUtil {
     private static Connection connection;
 
     public static String getUUIDFromSQLite(String uuid) {
+        String result = null;
         try {
             PreparedStatement preparedStatement = getSQLiteConnection().prepareStatement("select * from bypass where uuid = ?");
             preparedStatement.setString(1, uuid);
 
             ResultSet resultSet = preparedStatement.executeQuery();
-            if(resultSet.next()) return resultSet.getString(1);
+            if(resultSet.next()) result = resultSet.getString(1);
+
+            preparedStatement.close();
+            //PreparedStatementが閉じたらResultSetは閉じるはず
 
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
-        return null;
+        return result;
     }
 
     public static void putSQLite(String uuid) {