Major bug fixes with database being locked

hsyyid · Jun 22, 2016 · bd10d52 · bd10d52
1 parent aa1d2d8
commit bd10d52
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
-version = '0.6.2'
+version = '0.6.3'
 group = "io.github.hsyyid"
 archivesBaseName = "Inspector"
 
@@ -26,7 +26,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.spongepowered:spongeapi:4.0.0"
+    compile "org.spongepowered:spongeapi:4.2.0-SNAPSHOT"
 	compile "com.github.Flibio:Updatifier:v1.0.0"
 }
 

diff --git a/src/main/java/io/github/hsyyid/inspector/PluginInfo.java b/src/main/java/io/github/hsyyid/inspector/PluginInfo.java
@@ -7,6 +7,6 @@ public abstract class PluginInfo
 {
 	public static final String ID = "io.github.hsyyid.inspector";
 	public static final String NAME = "Inspector";
-	public static final String VERSION = "0.6.2";
+	public static final String VERSION = "0.6.3";
 	public static final String DESCRIPTION = "This plugin enables servers to monitor griefing and provides rollback.";
 }
diff --git a/src/main/java/io/github/hsyyid/inspector/utilities/DatabaseManager.java b/src/main/java/io/github/hsyyid/inspector/utilities/DatabaseManager.java
@@ -124,7 +124,8 @@ public boolean isPlayerInDatabase(Player player)
 			Connection c = this.getDatabaseConnection();
 			Statement stmt = c.createStatement();
 			stmt.executeUpdate("CREATE TABLE IF NOT EXISTS PLAYERS" + "(ID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL," + " UUID          TEXT       NOT NULL," + " NAME          TEXT       NOT NULL)");
-
+			stmt.close();
+
 			PreparedStatement preparedStmt = c.prepareStatement("SELECT count(*) from PLAYERS WHERE uuid=?");
 			preparedStmt.setString(1, player.getUniqueId().toString());
 			ResultSet rs = preparedStmt.executeQuery();
@@ -134,7 +135,7 @@ public boolean isPlayerInDatabase(Player player)
 				isInDatabase = rs.getInt(1) > 0;
 			}
 
-			stmt.close();
+			rs.close();
 			preparedStmt.close();
 		}
 		catch (SQLException e)
@@ -162,6 +163,7 @@ private int getPlayerId(UUID uniqueId)
 				id = rs.getInt("id");
 			}
 
+			rs.close();
 			stmt.close();
 		}
 		catch (SQLException e)
@@ -186,6 +188,7 @@ private UUID getPlayerUniqueId(int id)
 				return UUID.fromString(rs.getString("uuid"));
 			}
 
+			rs.close();
 			stmt.close();
 		}
 		catch (SQLException e)
@@ -212,6 +215,7 @@ private String getPlayerName(int id)
 				name = rs.getString("name");
 			}
 
+			rs.close();
 			stmt.close();
 		}
 		catch (SQLException e)
@@ -242,6 +246,7 @@ public List<BlockInformation> getBlockInformationAt(Location<World> location)
 				blockInformation.add(new BlockInformation(location, oldBlockSnapshot, newBlockSnapshot, rs.getString("time"), this.getPlayerUniqueId(id), this.getPlayerName(id)));
 			}
 
+			rs.close();
 			stmt.close();
 		}
 		catch (SQLException e)
@@ -275,6 +280,7 @@ public List<BlockInformation> getBlockInformationAt(Set<Location<World>> locatio
 					blockInformation.add(new BlockInformation(location, oldBlockSnapshot, newBlockSnapshot, rs.getString("time"), playerUniqueId, this.getPlayerName(playerId)));
 				}
 
+				rs.close();
 				stmt.close();
 			}
 			catch (SQLException e)