Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 07:09:56 +01:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary DB_CLOSE_ON_EXIT parameter.

Browse Source
This commit is contained in:
akwizgran
2017-11-09 14:51:35 +00:00
parent cf54360a93
commit 90e395506f
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java
View File

@@ -38,7 +38,7 @@ class H2Database extends JdbcDatabase {
File dir = config.getDatabaseDirectory(); File dir = config.getDatabaseDirectory();
String path = new File(dir, "db").getAbsolutePath(); String path = new File(dir, "db").getAbsolutePath();
url = "jdbc:h2:split:" + path + ";CIPHER=AES;MULTI_THREADED=1" url = "jdbc:h2:split:" + path + ";CIPHER=AES;MULTI_THREADED=1"
+ ";WRITE_DELAY=0;DB_CLOSE_ON_EXIT=false"; + ";WRITE_DELAY=0";
} }
@Override @Override

3
bramble-core/src/test/java/org/briarproject/bramble/db/BasicH2Test.java
View File

@@ -27,8 +27,7 @@ public class BasicH2Test extends BasicDatabaseTest {
@Override @Override
protected Connection openConnection(File db, boolean encrypt) protected Connection openConnection(File db, boolean encrypt)
throws SQLException { throws SQLException {
String url = "jdbc:h2:split:" + db.getAbsolutePath() String url = "jdbc:h2:split:" + db.getAbsolutePath();
+ ";DB_CLOSE_ON_EXIT=false";
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("user", "user"); props.setProperty("user", "user");
if (encrypt) { if (encrypt) {

4
bramble-core/src/test/java/org/briarproject/bramble/db/H2TransactionIsolationTest.java
View File

@@ -35,9 +35,9 @@ public class H2TransactionIsolationTest extends BrambleTestCase {
private final File testDir = TestUtils.getTestDirectory(); private final File testDir = TestUtils.getTestDirectory();
private final File db = new File(testDir, "db"); private final File db = new File(testDir, "db");
private final String withMvcc = "jdbc:h2:split:" + db.getAbsolutePath() 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() 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 @Before
public void setUp() throws Exception { public void setUp() throws Exception {