aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-12-09 14:44:34 +0100
committerErlang/OTP <[email protected]>2015-12-09 14:44:34 +0100
commit62155e5f5b27c962901bde1ed8ab97562c2fa108 (patch)
tree1a9ef9a112b345149614be9852f46276f3b84cf8
parent82d5db1537fe1661051783ef909b103984e7661c (diff)
parentc2d88d4b3fec56ac6def50ecc651dc1cefd1bf5d (diff)
downloadotp-62155e5f5b27c962901bde1ed8ab97562c2fa108.tar.gz
otp-62155e5f5b27c962901bde1ed8ab97562c2fa108.tar.bz2
otp-62155e5f5b27c962901bde1ed8ab97562c2fa108.zip
Merge branch 'anders/diameter/pick_peer/OTP-11789' into maint-r16
* anders/diameter/pick_peer/OTP-11789: Fix pick_peer case clause failure
-rw-r--r--lib/diameter/src/base/diameter_service.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 70e66537ed..67778b86f9 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -1390,6 +1390,8 @@ pick_peer(Local, Remote, Pid, _SvcName, #diameter_app{mutable = true} = App)
case call_service(Pid, {pick_peer, Local, Remote, App}) of
{TPid, _} = T when is_pid(TPid) ->
T;
+ false = No ->
+ No;
{error, _} ->
false
end;