aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-05-07 08:38:24 +0200
committerJohn Högberg <[email protected]>2018-05-07 08:38:24 +0200
commita06534d31516a4f4c06c8c8f558e9a94b4865617 (patch)
tree252ca2c4058113915d7b30a4a57ea591d5c02a16
parent5a4112b53facc42fec58ca31b96b2791bd70d328 (diff)
parentfc1b02a54ead68e1544da3c1ba7e26650c9e90e0 (diff)
downloadotp-a06534d31516a4f4c06c8c8f558e9a94b4865617.tar.gz
otp-a06534d31516a4f4c06c8c8f558e9a94b4865617.tar.bz2
otp-a06534d31516a4f4c06c8c8f558e9a94b4865617.zip
Merge branch 'john/tools/cuddle-lcnt-tests'
* john/tools/cuddle-lcnt-tests: Ensure that lcnt server is terminated after lcnt:stop/0
-rw-r--r--lib/tools/src/lcnt.erl5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl
index d0152a4915..1db90c1d86 100644
--- a/lib/tools/src/lcnt.erl
+++ b/lib/tools/src/lcnt.erl
@@ -125,7 +125,7 @@
%% -------------------------------------------------------------------- %%
start() -> gen_server:start({local, ?MODULE}, ?MODULE, [], []).
-stop() -> gen_server:call(?MODULE, stop, infinity).
+stop() -> gen_server:stop(?MODULE, normal, infinity).
init([]) -> {ok, #state{ locks = [], duration = 0 } }.
start_internal() ->
@@ -442,9 +442,6 @@ handle_call({save, Filename}, _From, State) ->
{reply, {error, Error}, State}
end;
-handle_call(stop, _From, State) ->
- {stop, normal, ok, State};
-
handle_call(Command, _From, State) ->
{reply, {error, {undefined, Command}}, State}.