diff options
author | Fredrik Gustafsson <[email protected]> | 2013-04-15 11:57:59 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-04-15 11:57:59 +0200 |
commit | efbf57358b8afca275545a627713bcf14969e243 (patch) | |
tree | 6fc8087ac679d2d545b63b1f2de9fb303e65f3e1 /lib/stdlib/src/epp.erl | |
parent | 057c411456f6e60cd1fcf0acd1a226381f43cea8 (diff) | |
parent | 8e236f7c5a0c6383e5f604a781e68b1685127e15 (diff) | |
download | otp-efbf57358b8afca275545a627713bcf14969e243.tar.gz otp-efbf57358b8afca275545a627713bcf14969e243.tar.bz2 otp-efbf57358b8afca275545a627713bcf14969e243.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib/src/epp.erl')
-rw-r--r-- | lib/stdlib/src/epp.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl index 0a1caa7178..e31cd63f69 100644 --- a/lib/stdlib/src/epp.erl +++ b/lib/stdlib/src/epp.erl @@ -1339,8 +1339,7 @@ epp_reply(From, Rep) -> wait_epp_reply(Epp, Mref) -> receive {epp_reply,Epp,Rep} -> - erlang:demonitor(Mref), - receive {'DOWN',Mref,_,_,_} -> ok after 0 -> ok end, + erlang:demonitor(Mref, [flush]), Rep; {'DOWN',Mref,_,_,E} -> receive {epp_reply,Epp,Rep} -> Rep |