aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-09-29 08:29:11 +0200
committerHans Bolinder <[email protected]>2016-09-29 08:29:11 +0200
commit2b1d54c48ea4e72876e02b1380553105138c842c (patch)
treeb941c6e48de40333f8c221fd061c629bf07b203b /lib/stdlib
parentc0d124562fb4de88e823513df025647d0f6c41fd (diff)
parent8bde09c998c68265361155aa8ed188aa0e2a4a44 (diff)
downloadotp-2b1d54c48ea4e72876e02b1380553105138c842c.tar.gz
otp-2b1d54c48ea4e72876e02b1380553105138c842c.tar.bz2
otp-2b1d54c48ea4e72876e02b1380553105138c842c.zip
Merge branch 'maint'
* maint: parsetools: Correct handling of Unicode in Leex Don't report error for shutdown exit tuple
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/supervisor.erl4
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);