aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-12-15 16:03:29 +0100
committerErlang/OTP <[email protected]>2017-12-15 16:03:29 +0100
commiteb196bf31e9e387d02bca50eaf4542525a7582ae (patch)
tree85c79f71a86178b799499c1e1842a64a9839f243 /lib
parent68333f8966cf79630d96edb44bbbaed7a7829186 (diff)
parentb0019accbd2ad3f5f433a8ca0c877f3bf8456f92 (diff)
downloadotp-eb196bf31e9e387d02bca50eaf4542525a7582ae.tar.gz
otp-eb196bf31e9e387d02bca50eaf4542525a7582ae.tar.bz2
otp-eb196bf31e9e387d02bca50eaf4542525a7582ae.zip
Merge branch 'dgud/mnesia/backup-error-handling/OTP-14776' into maint-19
* dgud/mnesia/backup-error-handling/OTP-14776: mnesia: Fix error handling in abort write
Diffstat (limited to 'lib')
-rw-r--r--lib/mnesia/src/mnesia_log.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 9536effd42..685d512acf 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -752,8 +752,8 @@ abort_write(B, What, Args, Reason) ->
Opaque = B#backup_args.opaque,
dbg_out("Failed to perform backup. M=~p:F=~p:A=~p -> ~p~n",
[Mod, What, Args, Reason]),
- try apply(Mod, abort_write, [Opaque]) of
- {ok, _Res} -> throw({error, Reason})
+ try {ok, _Res} = apply(Mod, abort_write, [Opaque]) of
+ _ -> throw({error, Reason})
catch _:Other ->
error("Failed to abort backup. ~p:~p~p -> ~p~n",
[Mod, abort_write, [Opaque], Other]),