ensure proper connections closure in tests to avoid background threads leak

h2/src/test/org/h2/test/db/TestAnalyzeTableTx.java

@@ -25,20 +25,17 @@ public class TestAnalyzeTableTx extends TestDb {
 
     @Override
     public boolean isEnabled() {
-        if (config.networked || config.big) {
-            return false;
-        }
-        return true;
+        return !config.networked && !config.big;
     }
 
     @Override
     public void test() throws Exception {
         deleteDb(getTestName());
-        Connection shared = getConnection(getTestName());
+        Connection[] connections = new Connection[C];
+        try (Connection shared = getConnection(getTestName())) {
             Statement statement = shared.createStatement();
             statement.executeUpdate("DROP TABLE IF EXISTS TEST");
             statement.executeUpdate("CREATE TABLE TEST(ID INT PRIMARY KEY)");
-        Connection[] connections = new Connection[C];
             for (int i = 0; i < C; i++) {
                 Connection c = getConnection(getTestName());
                 c.createStatement().executeUpdate("INSERT INTO TEST VALUES (" + i + ')');
@@ -52,5 +49,12 @@ public class TestAnalyzeTableTx extends TestDb {
                         throw new Exception(Integer.toString(i));
                 }
             }
+        } finally {
+            for (Connection connection : connections) {
+                if (connection != null) {
+                    try { connection.close(); } catch (Throwable ignore) {/**/}
+                }
+            }
+        }
     }
 }

h2/src/test/org/h2/test/db/TestMultiThread.java

@@ -506,8 +506,7 @@ public class TestMultiThread extends TestDb implements Runnable {
 
         @Override
         public void run() {
-            try {
-                Connection c = getConnection("concurrentUpdate2;LOCK_TIMEOUT=10000");
+            try (Connection c = getConnection("concurrentUpdate2;LOCK_TIMEOUT=10000")) {
                 PreparedStatement ps = c.prepareStatement("UPDATE TEST SET V = ? WHERE " + column + " = ?");
                 for (int test = 0; test < 1000; test++) {
                     for (int i = 0; i < 16; i++) {
@@ -524,7 +523,7 @@ public class TestMultiThread extends TestDb implements Runnable {
 
     private void testConcurrentUpdate2() throws Exception {
         deleteDb("concurrentUpdate2");
-        Connection c = getConnection("concurrentUpdate2");
+        try (Connection c = getConnection("concurrentUpdate2")) {
             Statement s = c.createStatement();
             s.execute("CREATE TABLE TEST(A INT, B INT, V INT, PRIMARY KEY(A, B))");
             PreparedStatement ps = c.prepareStatement("INSERT INTO TEST VALUES (?, ?, ?)");
@@ -542,7 +541,6 @@ public class TestMultiThread extends TestDb implements Runnable {
             b.start();
             a.join();
             b.join();
-        deleteDb("concurrentUpdate2");
             Throwable e = a.exception;
             if (e == null) {
                 e = b.exception;
@@ -553,5 +551,8 @@ public class TestMultiThread extends TestDb implements Runnable {
                 }
                 throw (Error) e;
             }
+        } finally {
+            deleteDb("concurrentUpdate2");
+        }
     }
 }