diff options
| author | Dan Gudmundsson <[email protected]> | 2017-12-19 10:24:35 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-12-19 10:24:35 +0100 |
| commit | 135317d5587af9e8479bfcc6e767913fc4f7a6de (patch) | |
| tree | dce122fe09520465f7ccf2075bfc155137ee7df8 /lib/mnesia/src | |
| parent | 21e63eacd7af3cf7857d4673a2bf0f20cdb1f8b9 (diff) | |
| parent | ac3328d8a231806a8c3444c636c606dcd59d9347 (diff) | |
| download | otp-135317d5587af9e8479bfcc6e767913fc4f7a6de.tar.gz otp-135317d5587af9e8479bfcc6e767913fc4f7a6de.tar.bz2 otp-135317d5587af9e8479bfcc6e767913fc4f7a6de.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
mnesia: Fix checkpoint crash
Diffstat (limited to 'lib/mnesia/src')
| -rw-r--r-- | lib/mnesia/src/mnesia_checkpoint.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl index 2ff77326a9..8112378ffd 100644 --- a/lib/mnesia/src/mnesia_checkpoint.erl +++ b/lib/mnesia/src/mnesia_checkpoint.erl @@ -857,9 +857,9 @@ retainer_loop(Cp = #checkpoint_args{is_activated=false, name=Name}) -> retainer_loop(Cp = #checkpoint_args{name=Name}) -> receive {_From, {retain, Tid, Tab, Key, OldRecs}} -> - R = val({Tab, {retainer, Name}}), + R = ?catch_val({Tab, {retainer, Name}}), PendingTab = Cp#checkpoint_args.pending_tab, - case R#retainer.really_retain of + case is_record(R, retainer) andalso R#retainer.really_retain of true -> Store = R#retainer.store, try true = ets:member(PendingTab, Tid), |