Fixed #5 for real this time

AuraDevelopmentTeam · Apr 24, 2017 · d28330d · d28330d
1 parent 9a63a42
commit d28330d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/main/java/world/jnc/invsync/DataSource.java b/src/main/java/world/jnc/invsync/DataSource.java
@@ -82,6 +82,10 @@ public DataSource() throws SQLException {
 	}
 
 	public void saveInventory(Player player, PlayerData data) {
+		if (!connection.verifyConnection()) {
+			prepareStatements();
+		}
+
 		String playerName = getPlayerString(player);
 
 		try {
@@ -101,6 +105,10 @@ public void saveInventory(Player player, PlayerData data) {
 	}
 
 	public Optional<PlayerData> loadInventory(Player player) {
+		if (!connection.verifyConnection()) {
+			prepareStatements();
+		}
+
 		String playerName = getPlayerString(player);
 
 		try {
@@ -131,6 +139,10 @@ public Optional<PlayerData> loadInventory(Player player) {
 	}
 
 	public void setActive(Player player) {
+		if (!connection.verifyConnection()) {
+			prepareStatements();
+		}
+
 		String playerName = getPlayerString(player);
 
 		try {
@@ -146,6 +158,10 @@ public void setActive(Player player) {
 	}
 
 	public boolean isActive(Player player) {
+		if (!connection.verifyConnection()) {
+			prepareStatements();
+		}
+
 		try {
 			isActive.setBytes(1, getBytesFromUUID(player.getUniqueId()));
 

diff --git a/src/main/java/world/jnc/invsync/util/database/DatabaseConnection.java b/src/main/java/world/jnc/invsync/util/database/DatabaseConnection.java
@@ -30,7 +30,7 @@ protected static DataSource getDataSource(String jdbcUrl) throws SQLException {
 
 		return sql.getDataSource(jdbcUrl);
 	}
-	
+
 	protected DatabaseConnection(String connectionURL) throws SQLException {
 		connect(connectionURL);
 	}
@@ -59,10 +59,18 @@ public boolean isConnectionActive() {
 		}
 	}
 
-	public void verifyConnection() throws SQLException {
+	public boolean verifyConnection() {
 		if (!isConnectionActive()) {
-			reconnect();
+			try {
+				reconnect();
+			} catch (SQLException e) {
+				InventorySync.getLogger().error("Reconnecting failed!", e);
+			}
+
+			return false;
 		}
+
+		return true;
 	}
 
 	public Statement getStatement() throws SQLException {