diff options
author | Dan Gudmundsson <[email protected]> | 2017-05-03 15:02:08 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2017-05-03 15:02:08 +0200 |
commit | 95e22b101b73087630fd58ae2487a91fcf004334 (patch) | |
tree | b8e4a8504dca074de410f93f93d6e58fb4cc4d8f /lib/mnesia/src/mnesia_schema.erl | |
parent | 97b0d768edd96f527238403b1b4d2658b3506eed (diff) | |
parent | d15ff3f296f8b399c4c3750ca47683998bfbc808 (diff) | |
download | otp-95e22b101b73087630fd58ae2487a91fcf004334.tar.gz otp-95e22b101b73087630fd58ae2487a91fcf004334.tar.bz2 otp-95e22b101b73087630fd58ae2487a91fcf004334.zip |
Merge branch 'dgud/mnesia/snmp-sup'
* dgud/mnesia/snmp-sup:
mnesia: Remove not used mnesia_snmp_sup
Do not call which_applications()
Diffstat (limited to 'lib/mnesia/src/mnesia_schema.erl')
-rw-r--r-- | lib/mnesia/src/mnesia_schema.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl index b0d7965886..5f269a0826 100644 --- a/lib/mnesia/src/mnesia_schema.erl +++ b/lib/mnesia/src/mnesia_schema.erl @@ -866,18 +866,18 @@ list2cs(List, ExtTypes) when is_list(List) -> is_list(DetsOpts) orelse mnesia:abort({badarg, Name, {dets, DetsOpts}}), [CheckProp(Prop, BadDetsOpts) || Prop <- DetsOpts], - case lists:keymember(mnesia, 1, application:which_applications()) of - true -> - Keys = check_keys(Name, List), - check_duplicates(Name, Keys); - false -> + case whereis(mnesia_controller) of + undefined -> %% check_keys/2 cannot be executed when mnesia is not %% running, due to it not being possible to read what ext %% backends are loaded. - %%% this doesn't work - disabled for now: - %%%Keys = check_keys(Name, List, record_info(fields, cstruct)), - %%%check_duplicates(Name, Keys) - ignore + %% this doesn't work - disabled for now: + %%Keys = check_keys(Name, List, record_info(fields, cstruct)), + %%check_duplicates(Name, Keys) + ignore; + Pid when is_pid(Pid) -> + Keys = check_keys(Name, List), + check_duplicates(Name, Keys) end, Cs0 = #cstruct{name = Name, |