aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-09-01 16:58:50 +0200
committerAnders Svensson <[email protected]>2017-09-01 16:58:50 +0200
commitae6966491183c62f6513b175aaede785871240cf (patch)
treecbbe2178bd4b947d4f64cd9aec7c566c9eb0bc5e
parent3ec3cc239999cb59d1260b6c7790eb112d9da47c (diff)
downloadotp-ae6966491183c62f6513b175aaede785871240cf.tar.gz
otp-ae6966491183c62f6513b175aaede785871240cf.tar.bz2
otp-ae6966491183c62f6513b175aaede785871240cf.zip
Fix strict_arities blunder
Remove value from the merged map, not from the maps being merged. Bundled in commit 5f3becad.
-rw-r--r--lib/diameter/src/base/diameter_service.erl10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index c7b0e706a5..1e104f9e65 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -718,9 +718,13 @@ init_peers() ->
%% TPid}
service_opts(Opts) ->
- T = {strict_arities, true},
- maps:merge(maps:from_list([{monitor, false} | def_opts() -- [T]]),
- maps:from_list(Opts -- [T])).
+ remove([{strict_arities, true}],
+ maps:merge(maps:from_list([{monitor, false} | def_opts()]),
+ maps:from_list(Opts))).
+
+remove(List, Map) ->
+ maps:filter(fun(K,V) -> not lists:member({K,V}, List) end,
+ Map).
def_opts() -> %% defaults on the service map
[{share_peers, false},