Skip to content

Merge remote-tracking branch 'origin/releases' into mc/merge/1.0_1f14e5e9#3016

Merged
cmelchior merged 8 commits intomasterfrom
mc/merge/1.0_1f14e5e9
Jun 17, 2016
Merged

Merge remote-tracking branch 'origin/releases' into mc/merge/1.0_1f14e5e9#3016
cmelchior merged 8 commits intomasterfrom
mc/merge/1.0_1f14e5e9

Conversation

@beeender
Copy link
Copy Markdown
Contributor

No description provided.

emanuelez and others added 7 commits June 16, 2016 10:01
* Add a Dockerfile to the repo

This is done to facilitate CI and build reproducibility
* Enable -Wmissing-declarations and -Werror to ensure all global
  functions are defined with a proper declaration. JNI function not
  found problem can only be seen at run time, thus we need to do so.
* Add static keyword for local functions.
* Fix wrong JNI function declaration.
* Remove useless functions.
* TableView distinct should return void.
* Rename JNI cpp files.
We have anecdotal evidence that multiple processes might be open for the same app. We have not been able to verify this, but the result matches the "IncompatibleLockFile" errors reported in #2459. This happens if the two processes have two versions of Realm (e.g. during app upgrades).

This PR is based on our assumption that such an overlap is not intentional and only happens because one process is started before the previous was completely shut down.

So this PR introduces an optimistic opening scheme where we retry for 3 second before crashing as before.
@beeender beeender force-pushed the mc/merge/1.0_1f14e5e9 branch from 97d7110 to 0dd9122 Compare June 16, 2016 16:05
@cmelchior
Copy link
Copy Markdown
Contributor

👍

1 similar comment
@stk1m1
Copy link
Copy Markdown
Contributor

stk1m1 commented Jun 17, 2016

👍

@cmelchior cmelchior merged commit f3912a9 into master Jun 17, 2016
@cmelchior cmelchior deleted the mc/merge/1.0_1f14e5e9 branch June 17, 2016 06:48
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants