aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mnesia/src/mnesia_log.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-12-04 13:18:36 +0100
committerDan Gudmundsson <[email protected]>2017-12-04 13:18:36 +0100
commitad548db90d739a5fa5498d2b9b227bc6b01e9e73 (patch)
treea91490868b9ce43446cf2dfc2aae4f1d5dd8d47d /lib/mnesia/src/mnesia_log.erl
parente73bb39ccac7edb24afb54d9d60835c539e23311 (diff)
parentb0019accbd2ad3f5f433a8ca0c877f3bf8456f92 (diff)
downloadotp-ad548db90d739a5fa5498d2b9b227bc6b01e9e73.tar.gz
otp-ad548db90d739a5fa5498d2b9b227bc6b01e9e73.tar.bz2
otp-ad548db90d739a5fa5498d2b9b227bc6b01e9e73.zip
Merge branch 'dgud/mnesia/backup-error-handling/OTP-14776' into maint
* dgud/mnesia/backup-error-handling/OTP-14776: mnesia: Fix error handling in abort write
Diffstat (limited to 'lib/mnesia/src/mnesia_log.erl')
-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 55b1d6e419..a2de23a2a3 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=~tp:A=~tp -> ~tp~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:~tp~tp -> ~tp~n",
[Mod, abort_write, [Opaque], Other]),