diff options
| author | Dan Gudmundsson <[email protected]> | 2016-10-24 13:05:52 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-10-24 13:05:52 +0200 |
| commit | 1a812284999c8f38d84f380775b88f7bdc1f1432 (patch) | |
| tree | d94aac6989e1d3c40563327f8dabc9122d71d51d /lib/mnesia/src/mnesia_tm.erl | |
| parent | adf1e9efdfb979d55b2f4dfec7188dd8f0a640c9 (diff) | |
| parent | 16b6c991cc841ced6be466eca774dba1188f8640 (diff) | |
| download | otp-1a812284999c8f38d84f380775b88f7bdc1f1432.tar.gz otp-1a812284999c8f38d84f380775b88f7bdc1f1432.tar.bz2 otp-1a812284999c8f38d84f380775b88f7bdc1f1432.zip | |
Merge branch 'maint'
* maint:
Fix whitespace setting in test files
Avoid some error reports when stopping mnesia
wx: Improve error handling
Fix all whitespace-related issues in erlang.el
mnesia: Fix double blocked tables which could cause a crash
wx: Add wxWindow:getContentScaleFactor
Diffstat (limited to 'lib/mnesia/src/mnesia_tm.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_tm.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl index b116b48312..388b42cf15 100644 --- a/lib/mnesia/src/mnesia_tm.erl +++ b/lib/mnesia/src/mnesia_tm.erl @@ -950,7 +950,7 @@ return_abort(Fun, Args, Reason) -> if Level == 1 -> mnesia_locker:async_release_tid(Nodes, Tid), - ?MODULE ! {delete_transaction, Tid}, + ?SAFE(?MODULE ! {delete_transaction, Tid}), erase(mnesia_activity_state), flush_downs(), ?SAFE(unlink(whereis(?MODULE))), |