From 90e395506f67de4cbd2700f93679ed680e1146a4 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 9 Nov 2017 14:51:35 +0000
Subject: [PATCH] Remove unnecessary DB_CLOSE_ON_EXIT parameter.
---
.../src/main/java/org/briarproject/bramble/db/H2Database.java | 2 +-
.../test/java/org/briarproject/bramble/db/BasicH2Test.java | 3 +--
.../briarproject/bramble/db/H2TransactionIsolationTest.java | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
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 307f146e19..2ee4d680a2 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 ebfe9879f2..83678facc2 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 1192f9dd35..c91690bd9c 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 {
--
GitLab