diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java b/bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java index 307f146e19dc6a819c4e53a760d1933c9e5df60a..2ee4d680a2d0db4ee210f6bbad1bf9f8f9ce4277 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java @@ -38,7 +38,7 @@ class H2Database extends JdbcDatabase { File dir = config.getDatabaseDirectory(); String path = new File(dir, "db").getAbsolutePath(); url = "jdbc:h2:split:" + path + ";CIPHER=AES;MULTI_THREADED=1" - + ";WRITE_DELAY=0;DB_CLOSE_ON_EXIT=false"; + + ";WRITE_DELAY=0"; } @Override diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java b/bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java index ebfe9879f2d23106629a5b23264c42a286420209..83678facc22f4dc8af7e457492fb8866fc0b1ae9 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java @@ -27,8 +27,7 @@ public class BasicH2Test extends BasicDatabaseTest { @Override protected Connection openConnection(File db, boolean encrypt) throws SQLException { - String url = "jdbc:h2:split:" + db.getAbsolutePath() - + ";DB_CLOSE_ON_EXIT=false"; + String url = "jdbc:h2:split:" + db.getAbsolutePath(); Properties props = new Properties(); props.setProperty("user", "user"); if (encrypt) { diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/H2TransactionIsolationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/H2TransactionIsolationTest.java index 1192f9dd35b27c26aca5db558a25f0c16799528f..c91690bd9c7b4eb27baee434b475bf3e811aa567 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/H2TransactionIsolationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/H2TransactionIsolationTest.java @@ -35,9 +35,9 @@ public class H2TransactionIsolationTest extends BrambleTestCase { private final File testDir = TestUtils.getTestDirectory(); private final File db = new File(testDir, "db"); private final String withMvcc = "jdbc:h2:split:" + db.getAbsolutePath() - + ";MV_STORE=TRUE;MVCC=TRUE;DB_CLOSE_ON_EXIT=false"; + + ";MV_STORE=TRUE;MVCC=TRUE"; private final String withoutMvcc = "jdbc:h2:split:" + db.getAbsolutePath() - + ";MV_STORE=FALSE;MVCC=FALSE;LOCK_MODE=1;DB_CLOSE_ON_EXIT=false"; + + ";MV_STORE=FALSE;MVCC=FALSE;LOCK_MODE=1"; @Before public void setUp() throws Exception {