1 files changed, 17 insertions, 0 deletions
diff --git a/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java b/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
index eb5c8dc..4e4b622 100644
--- a/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
+++ b/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
@@ -31,6 +31,8 @@ import org.apache.commons.dbcp.BasicDataSource;
 
 import com.amazon.carbonado.*;
 
+import com.amazon.carbonado.capability.ShutdownCapability;
+
 import com.amazon.carbonado.lob.*;
 
 import com.amazon.carbonado.repo.indexed.IndexedRepositoryBuilder;
@@ -60,6 +62,21 @@ public class TestH2 extends com.amazon.carbonado.TestStorables {
         super(name);
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        Repository repo = getRepository();
+        JDBCConnectionCapability cap = repo.getCapability(JDBCConnectionCapability.class);
+        if (cap == null) {
+            super.tearDown();
+        } else {
+            ShutdownCapability cap2 = repo.getCapability(ShutdownCapability.class);
+            if (cap2 != null) {
+                cap2.setAutoShutdownEnabled(false);
+            }
+            cap.getConnection().createStatement().execute("SHUTDOWN IMMEDIATELY");
+        }
+    }
+
     public void test_propertyOther() throws Exception {
         Storage<WithPropertyOther> storage = getRepository().storageFor(WithPropertyOther.class);
         WithPropertyOther other = storage.prepare();