aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-12-04 13:25:09 +0100
committerDan Gudmundsson <[email protected]>2017-12-04 13:25:09 +0100
commit8af334f693bbe8a2d73d8eec29d13bdd133e90d2 (patch)
tree1e3799916490e557ad8c6e5e8b6ff1c30a5c7898
parent5c2a0f31c5a2af422607e64da65e2db90f5cb720 (diff)
parentad548db90d739a5fa5498d2b9b227bc6b01e9e73 (diff)
downloadotp-8af334f693bbe8a2d73d8eec29d13bdd133e90d2.tar.gz
otp-8af334f693bbe8a2d73d8eec29d13bdd133e90d2.tar.bz2
otp-8af334f693bbe8a2d73d8eec29d13bdd133e90d2.zip
Merge branch 'maint'
* maint: mnesia: Fix error handling in abort write
-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]),