aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/application_master.erl
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-04-15 11:57:59 +0200
committerFredrik Gustafsson <[email protected]>2013-04-15 11:57:59 +0200
commitefbf57358b8afca275545a627713bcf14969e243 (patch)
tree6fc8087ac679d2d545b63b1f2de9fb303e65f3e1 /lib/kernel/src/application_master.erl
parent057c411456f6e60cd1fcf0acd1a226381f43cea8 (diff)
parent8e236f7c5a0c6383e5f604a781e68b1685127e15 (diff)
downloadotp-efbf57358b8afca275545a627713bcf14969e243.tar.gz
otp-efbf57358b8afca275545a627713bcf14969e243.tar.bz2
otp-efbf57358b8afca275545a627713bcf14969e243.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src/application_master.erl')
-rw-r--r--lib/kernel/src/application_master.erl9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/kernel/src/application_master.erl b/lib/kernel/src/application_master.erl
index 679fefaed9..34a3efcaf2 100644
--- a/lib/kernel/src/application_master.erl
+++ b/lib/kernel/src/application_master.erl
@@ -76,13 +76,8 @@ call(AppMaster, Req) ->
{'DOWN', Ref, process, _, _Info} ->
ok;
{Tag, Res} ->
- erlang:demonitor(Ref),
- receive
- {'DOWN', Ref, process, _, _Info} ->
- Res
- after 0 ->
- Res
- end
+ erlang:demonitor(Ref, [flush]),
+ Res
end.
%%%-----------------------------------------------------------------