diff options
| author | Siri Hansen <[email protected]> | 2016-09-28 13:14:04 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-09-28 13:14:04 +0200 |
| commit | dabc6644991a6e732dc4404433215d1333a0ea07 (patch) | |
| tree | 9117e76372d37864cf31c66a328f04345670ce1d /lib | |
| parent | 59a77e7f8e2cbb227db1fa4515d37200b5b90cf2 (diff) | |
| parent | 2a56d0ed91c1c5e18008d1cf37406f36b46b4e62 (diff) | |
| download | otp-dabc6644991a6e732dc4404433215d1333a0ea07.tar.gz otp-dabc6644991a6e732dc4404433215d1333a0ea07.tar.bz2 otp-dabc6644991a6e732dc4404433215d1333a0ea07.zip | |
Merge branch 'legoscia/dynamic-child-shutdown-tuple/ERL-163/PR-1158/OTP-13907' into maint
* legoscia/dynamic-child-shutdown-tuple/ERL-163/PR-1158/OTP-13907:
Don't report error for shutdown exit tuple
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/supervisor.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl index c81e72689c..1cd65fbf18 100644 --- a/lib/stdlib/src/supervisor.erl +++ b/lib/stdlib/src/supervisor.erl @@ -1087,6 +1087,10 @@ wait_dynamic_children(#child{restart_type=RType} = Child, Pids, Sz, wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1, TRef, EStack); + {'DOWN', _MRef, process, Pid, {shutdown, _}} -> + wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1, + TRef, EStack); + {'DOWN', _MRef, process, Pid, normal} when RType =/= permanent -> wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1, TRef, EStack); |