Skip to content
Browse files

Merge branch 'anders/diameter/upgrade/OTP-10550' into maint

* anders/diameter/upgrade/OTP-10550:
  Allow for no diameter on remote node in connection guard
  • Loading branch information...
2 parents 3a86578 + 4aecd73 commit eb5f9a4b9b1d2691279dea2d1fe96e8feca5a452 Anders Svensson committed Nov 8, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 lib/diameter/src/base/diameter_peer_fsm.erl
View
7 lib/diameter/src/base/diameter_peer_fsm.erl
@@ -1015,7 +1015,12 @@ add(false, T) ->
unregistered(Nodes, T) ->
{ResL, _} = rpc:multicall(Nodes, ?MODULE, match, [{node(), T}]),
- lists:all(fun(L) -> [] == L end, ResL).
+ lists:all(fun nomatch/1, ResL).
+
+nomatch({badrpc, {'EXIT', {undef, _}}}) -> %% no diameter on remote node
+ true;
+nomatch(L) ->
+ [] == L.
%% match/1

0 comments on commit eb5f9a4

Please sign in to comment.
Something went wrong with that request. Please try again.