diff options
| author | Anders Svensson <[email protected]> | 2017-09-09 20:38:35 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-09-09 20:38:35 +0200 |
| commit | 8893ad1594b9ea918ede8a791407f9cae8285278 (patch) | |
| tree | 79608e637e1b090c1ca05583bcb51962125e8778 | |
| parent | 09e833c0795168a6380f62c167ff1a7bfd481b07 (diff) | |
| parent | 6890d375ab3347e337eb1cecf22215e57232b5eb (diff) | |
| download | otp-8893ad1594b9ea918ede8a791407f9cae8285278.tar.gz otp-8893ad1594b9ea918ede8a791407f9cae8285278.tar.bz2 otp-8893ad1594b9ea918ede8a791407f9cae8285278.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/diameter/src/base/diameter_reg.erl | 14 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl index 9ada36acc5..bd5db54a5c 100644 --- a/lib/diameter/src/base/diameter_reg.erl +++ b/lib/diameter/src/base/diameter_reg.erl @@ -340,24 +340,22 @@ notify(Op, {_,_} = Rec, #state{notify = Dict} = S) -> notify(Op, {_, Pid} = Rec, Pat, Rcvrs, Dict) -> case lists:member(Rec, match(Pat, Pid)) of true -> - reset(Pat, Dict, lists:foldr(fun(P,A) -> send(P, Op, Rec, A) end, - [], - Rcvrs)); + reset(Pat, Dict, [P || P <- Rcvrs, send(P, Op, Rec)]); false -> Dict end. -%% send/4 +%% send/3 -send([Pid | T] = Rcvr, Op, Rec, Acc) -> +send([Pid | T], Op, Rec) -> Pid ! {T, Op, Rec}, - [Rcvr | Acc]; + true; %% No processes wait on remove: they receive notification immediately %% or at add, by construction. -send({_,_} = From, add, Rec, Acc) -> +send({_,_} = From, add, Rec) -> gen_server:reply(From, [Rec]), - Acc. + false. %% down/2 diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index c08e2da672..43623334a9 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -74,7 +74,6 @@ okay := non_neg_integer()}, %% REOPEN -> OKAY codec :: #{decode_format := none, string_decode := false, - strict_arities => diameter:strict_arities(), strict_mbit := boolean(), rfc := 3588 | 6733, ordered_encode := false}, @@ -152,7 +151,6 @@ i({Ack, T, Pid, {Opts, okay => 3}, Opts)), codec = maps:with([decode_format, - strict_arities, strict_mbit, string_decode, rfc, |