diff options
| author | Anders Svensson <[email protected]> | 2012-11-08 12:56:16 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-11-08 12:56:16 +0100 |
| commit | eb5f9a4b9b1d2691279dea2d1fe96e8feca5a452 (patch) | |
| tree | 71b75400af40ad1cd56a9d5078660acce77b7b49 | |
| parent | 3a86578f9750b27ab8a42eb8880cef082e9fcec7 (diff) | |
| parent | 4aecd733017411b3975ef38aea37f0532cc0b324 (diff) | |
| download | otp-eb5f9a4b9b1d2691279dea2d1fe96e8feca5a452.tar.gz otp-eb5f9a4b9b1d2691279dea2d1fe96e8feca5a452.tar.bz2 otp-eb5f9a4b9b1d2691279dea2d1fe96e8feca5a452.zip | |
Merge branch 'anders/diameter/upgrade/OTP-10550' into maint
* anders/diameter/upgrade/OTP-10550:
Allow for no diameter on remote node in connection guard
| -rw-r--r-- | lib/diameter/src/base/diameter_peer_fsm.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl index 297a5d7709..3f4945f7a6 100644 --- a/lib/diameter/src/base/diameter_peer_fsm.erl +++ b/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 |