diff options
| author | Giuseppe Privitera <priviterag@gmail.com> | 2015-09-03 10:54:13 +0100 |
|---|---|---|
| committer | Giuseppe Privitera <priviterag@gmail.com> | 2015-09-03 10:54:13 +0100 |
| commit | 6a084b62c62809c5bdedabcb4b0a998cb42c6eb7 (patch) | |
| tree | 1c6e31af2c63d0bfabb4b881b6b1639228043cf8 /src | |
| parent | d8b9264bdb7f3a1cce639a3dbdb50cb588a3593e (diff) | |
| download | rabbitmq-server-git-6a084b62c62809c5bdedabcb4b0a998cb42c6eb7.tar.gz | |
updated rabbit_misc:plmerge to use dict:merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_misc.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 759e066bf2..cfabf1ed5e 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -893,9 +893,11 @@ pmerge(Key, Val, List) -> %% proplists merge plmerge(P1, P2) -> - K1 = proplists:get_keys(P1), - K2 = proplists:get_keys(P2), - P1 ++ [X || {K, _} = X <- P2, lists:member(K, K2 -- K1)]. + dict:to_list(dict:merge(fun(_, V, _) -> + V + end, + dict:from_list(P1), + dict:from_list(P2))). pset(Key, Value, List) -> [{Key, Value} | proplists:delete(Key, List)]. |