From 3678f71dc7004537c0cc0e3043f191db50b2fd28 Mon Sep 17 00:00:00 2001
From: AppleDash <derp@derpy.fr>
Date: Wed, 14 Jun 2017 19:50:27 -0400
Subject: [PATCH] Try to fix MySQL flushing hanging.

---
 .../saneeconomy/utils/database/MySQLConnection.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/MySQLConnection.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/MySQLConnection.java
index ead86ca..1ddb29c 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/MySQLConnection.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/utils/database/MySQLConnection.java
@@ -106,11 +106,16 @@ public class MySQLConnection {
     }
 
     public void waitUntilFlushed() {
+        long startTime = System.currentTimeMillis();
         while (openTransactions.get() > 0) {
+            if ((System.currentTimeMillis() - startTime) > 5000) {
+                LOGGER.warning("Took too long to flush all transactions - something has probably hung :(");
+                break;
+            }
+
             try {
                 Thread.sleep(50);
             } catch (InterruptedException ignored) {
-
             }
         }
     }