Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

4e5b6ed3

Commit 4e5b6ed3 authored 5 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '1367-db-race' into 'master'

Don't infer anything from existence of (possibly empty) DB directory

Closes #1528 and #1367

See merge request !1238

parents 676f5fae 77d037f0

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java 7 additions, 9 deletions

.../org/briarproject/bramble/api/account/AccountManager.java
bramble-api/src/main/java/org/briarproject/bramble/util/IoUtils.java 6 additions, 0 deletions

.../src/main/java/org/briarproject/bramble/util/IoUtils.java
bramble-core/src/main/java/org/briarproject/bramble/account/AccountManagerImpl.java 1 addition, 2 deletions

.../org/briarproject/bramble/account/AccountManagerImpl.java
bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java 3 additions, 1 deletion

...src/main/java/org/briarproject/bramble/db/H2Database.java
bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java 6 additions, 1 deletion

...in/java/org/briarproject/bramble/db/HyperSqlDatabase.java
bramble-core/src/test/java/org/briarproject/bramble/account/AccountManagerImplTest.java 0 additions, 49 deletions

.../briarproject/bramble/account/AccountManagerImplTest.java

with 23 additions and 62 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment