aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-12-05 18:50:40 +0100
committerAnders Svensson <[email protected]>2011-12-05 18:50:40 +0100
commit8a63d055adcc5cd148e89e6b7de3afa42e776bc8 (patch)
treea2d4d68789675096bc61a995479c8f339abe7a52
parent9f2ccc702120ad14eebccd3010b212e6ab029c8d (diff)
parent0eb8d09800265c2c1f7a3998ff28c07abbfb2558 (diff)
downloadotp-8a63d055adcc5cd148e89e6b7de3afa42e776bc8.tar.gz
otp-8a63d055adcc5cd148e89e6b7de3afa42e776bc8.tar.bz2
otp-8a63d055adcc5cd148e89e6b7de3afa42e776bc8.zip
Merge branch 'anders/diameter/transport_restart/OTP-9756'
* anders/diameter/transport_restart/OTP-9756: Fix transport restart bug
-rw-r--r--lib/diameter/src/base/diameter_service.erl9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 7adcf1c265..a85dda216d 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -647,11 +647,6 @@ mod_state(Alias) ->
mod_state(Alias, ModS) ->
put({?MODULE, mod_state, Alias}, ModS).
-%% have_transport/2
-
-have_transport(SvcName, Ref) ->
- [] /= diameter_config:have_transport(SvcName, Ref).
-
%%% ---------------------------------------------------------------------------
%%% # shutdown/2
%%% ---------------------------------------------------------------------------
@@ -1131,7 +1126,7 @@ start_tc(Tc, T, _) ->
%% tc_timeout/2
tc_timeout({Ref, _Type, _Opts} = T, #state{service_name = SvcName} = S) ->
- tc(have_transport(SvcName, Ref), T, S).
+ tc(diameter_config:have_transport(SvcName, Ref), T, S).
tc(true, {Ref, Type, Opts}, #state{service_name = SvcName}
= S) ->
@@ -1159,7 +1154,7 @@ close(Pid, #state{service_name = SvcName,
options = Opts}
= fetch(PeerT, Pid),
- c(Pid, have_transport(SvcName, Ref), Opts).
+ c(Pid, diameter_config:have_transport(SvcName, Ref), Opts).
%% Tell watchdog to (maybe) die later ...
c(Pid, true, Opts) ->