diff options
author | Anders Svensson <[email protected]> | 2013-02-12 12:51:56 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2013-02-12 12:51:56 +0100 |
commit | 1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7 (patch) | |
tree | 0bb4c01bc6c303154814848e4a52b07a16f161bd /lib/diameter/src/base/diameter_reg.erl | |
parent | 5bb22560c350baa834196835640a5aab21e97f8a (diff) | |
parent | 551bdf0da65bcb9838ddc613e0507e2871dcd5dc (diff) | |
download | otp-1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7.tar.gz otp-1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7.tar.bz2 otp-1e7b3534eeea4761bb45ff31bcdaf57cd66a7cb7.zip |
Merge branch 'anders/diameter/reopen/OTP-10692'
* anders/diameter/reopen/OTP-10692:
Fix testcases in event suite
Fix faulty watchdog transition INITIAL -> DOWN
Fix faulty watchdog transition DOWN -> INITIAL
Comment fixes
Rename records peer/conn -> watchdog/peer in diameter_service
Add testcases to traffic suite
Simplify watchdog transitions in service process
Simplify transport shutdown
Remove upgrade code not needed after application restart
Tweak (make) silent rules support
Diffstat (limited to 'lib/diameter/src/base/diameter_reg.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_reg.erl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl index 619b12ecad..ac58e4bf5b 100644 --- a/lib/diameter/src/base/diameter_reg.erl +++ b/lib/diameter/src/base/diameter_reg.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2012. All Rights Reserved. +%% Copyright Ericsson AB 2010-2013. 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 @@ -208,10 +208,6 @@ init(_) -> %% # handle_call/3 %% ---------------------------------------------------------- -handle_call(Req, From, S) - when not is_record(S, state) -> - handle_call(Req, From, upgrade(S)); - handle_call({add, Fun, Key, Pid}, _, S) -> B = Fun(?TABLE, {Key, Pid}), monitor(B andalso no_monitor(Pid), Pid), @@ -281,9 +277,6 @@ code_change(_OldVsn, State, _Extra) -> %% =========================================================================== -upgrade(S) -> - #state{} = list_to_tuple(tuple_to_list(S) ++ [[]]). - monitor(true, Pid) -> ets:insert(?TABLE, ?MONITOR(Pid, erlang:monitor(process, Pid))); monitor(false, _) -> |