Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Integrate merge request feedback

Browse Source
This commit is contained in:
Sebastian Kürten
2021-04-12 12:23:15 +02:00
parent ce47bfe018
commit 64f682146d
4 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,6 @@ class H2Database extends JdbcDatabase {
c = createConnection();
super.closeAllConnections();
setDirty(c, false);
c.commit();
c.close();
} catch (SQLException e) {
tryToClose(c, LOG, WARNING);

1
bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java
View File

@@ -82,7 +82,6 @@ class HyperSqlDatabase extends JdbcDatabase {
super.closeAllConnections();
c = createConnection();
setDirty(c, false);
c.commit();
s = c.createStatement();
s.executeQuery("SHUTDOWN");
s.close();

4
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java
View File

@@ -355,13 +355,13 @@ abstract class JdbcDatabase implements Database<Connection> {
@GuardedBy("connectionsLock")
private boolean closed = false;
private boolean wasDirtyOnInitialisation = false;
private volatile boolean wasDirtyOnInitialisation = false;
protected abstract Connection createConnection()
throws DbException, SQLException;
// Used exclusively during open to compact the database after schema
// migrations and after DatabaseConstants#MAX_COMPACTION_INTERVAL_MS has
// migrations or after DatabaseConstants#MAX_COMPACTION_INTERVAL_MS has
// elapsed
protected abstract void compactAndClose() throws DbException;