MVStoreTableEngine

h2/src/main/org/h2/engine/Database.java

@@ -1262,9 +1262,8 @@ public class Database implements DataHandler {
         if (mvStore != null) {
             if (!readOnly && compactMode != 0) {
                 mvStore.compactFile(dbSettings.maxCompactTime);
-            } else {
-                mvStore.close(dbSettings.maxCompactTime);
             }
+            mvStore.close(dbSettings.maxCompactTime);
         }
         closeFiles();
         if (persistent && lock == null && fileLockMethod != FileLock.LOCK_NO && fileLockMethod != FileLock.LOCK_FS) {

h2/src/test/org/h2/test/TestAll.java

@@ -805,10 +805,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         new TestStringUtils().runTest(this);
         new TestTools().runTest(this);
         new TestTraceSystem().runTest(this);
-
-        ; // TODO
         new TestUpgrade().runTest(this);
-
         new TestUtils().runTest(this);
         new TestValue().runTest(this);
         new TestValueHashMap().runTest(this);