aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-10-01 11:31:21 +0200
committerSiri Hansen <[email protected]>2014-10-01 11:31:21 +0200
commit49b386294e1ce7a01a8a31623a54cd13cd6acbc1 (patch)
tree15d1257c174ac4111223d6f5a9af14321576f85b /lib/stdlib
parent86ae7ccc44b38137c504a46b619ffad935d74b99 (diff)
parent506c3ca1f1481d722576fd59887bc5f06581528d (diff)
downloadotp-49b386294e1ce7a01a8a31623a54cd13cd6acbc1.tar.gz
otp-49b386294e1ce7a01a8a31623a54cd13cd6acbc1.tar.bz2
otp-49b386294e1ce7a01a8a31623a54cd13cd6acbc1.zip
Merge branch 'siri/new-dialyzer-gen_event/OTP-12206' into maint
* siri/new-dialyzer-gen_event/OTP-12206: Fix dialyzer warnings for unmatched return in gen_event
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/gen_event.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index 40c5a93d59..469acdc37c 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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
@@ -302,7 +302,8 @@ terminate_server(Reason, Parent, MSL, ServerName) ->
exit(Reason).
reply({From, Ref}, Msg) ->
- From ! {Ref, Msg}.
+ From ! {Ref, Msg},
+ ok.
%% unlink the supervisor process of all supervised handlers.
%% We do not want a handler supervisor to EXIT due to the