aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-02-09 23:24:15 +0100
committerAnders Svensson <[email protected]>2013-02-10 05:10:39 +0100
commit34c1a5a26d54cc30d3f666a8cbe92bee66573072 (patch)
tree229de65697b95245b527ce8d9fdcdd69991ebe78
parent05a6cc1c996acb8e8dfe168cb029b2a7a4fdbc3d (diff)
downloadotp-34c1a5a26d54cc30d3f666a8cbe92bee66573072.tar.gz
otp-34c1a5a26d54cc30d3f666a8cbe92bee66573072.tar.bz2
otp-34c1a5a26d54cc30d3f666a8cbe92bee66573072.zip
Remove upgrade code not needed after application restart
Which will be the case in R16B.
-rw-r--r--lib/diameter/src/transport/diameter_sctp.erl3
-rw-r--r--lib/diameter/src/transport/diameter_tcp.erl4
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index ac79fde07e..b80430a2e1 100644
--- a/lib/diameter/src/transport/diameter_sctp.erl
+++ b/lib/diameter/src/transport/diameter_sctp.erl
@@ -585,8 +585,7 @@ recv({_, #sctp_assoc_change{state = comm_up,
socket = Sock}
= S) ->
Ref = getr(?REF_KEY),
- is_reference(Ref) %% started in new code
- andalso publish(T, Ref, Id, Sock),
+ publish(T, Ref, Id, Sock),
up(S#transport{assoc_id = Id,
streams = {IS, OS}});
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index 596e582ab0..8966a79c79 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -557,9 +557,7 @@ tls_handshake(Type, true, #transport{socket = Sock,
= S) ->
{ok, SSock} = tls(Type, Sock, [{cb_info, ?TCP_CB(M)} | Opts]),
Ref = getr(?REF_KEY),
- is_reference(Ref) %% started in new code
- andalso
- (true = diameter_reg:add_new({?MODULE, Type, {Ref, SSock}})),
+ true = diameter_reg:add_new({?MODULE, Type, {Ref, SSock}}),
S#transport{socket = SSock,
module = ssl};