aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-10-01 11:41:38 +0200
committerSiri Hansen <[email protected]>2014-10-01 11:41:38 +0200
commitc8f2c6db648cc3fba41ccdfe2db4819bf5ce0872 (patch)
tree6ffd2f112243691159193db9489ea1d1efabd57b /lib/stdlib
parent0b99d067173cf0de96a1727af330638ec2e5e0d0 (diff)
parent49b386294e1ce7a01a8a31623a54cd13cd6acbc1 (diff)
downloadotp-c8f2c6db648cc3fba41ccdfe2db4819bf5ce0872.tar.gz
otp-c8f2c6db648cc3fba41ccdfe2db4819bf5ce0872.tar.bz2
otp-c8f2c6db648cc3fba41ccdfe2db4819bf5ce0872.zip
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/gen_event.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index ad9322cde3..5a1fff3a9c 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -314,7 +314,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