aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2011-10-20 14:38:31 +0200
committerHenrik Nord <henrik@erlang.org>2011-10-20 14:38:37 +0200
commite21bc712b95b878afd9ab3d93ac27ded0bce7ccf (patch)
tree404f249c13b57209a98c045e428b94c254ff6ca1 /lib/stdlib/src
parent6ef9aef50dbe839098e4330a97247aa21a15ecde (diff)
parent9679510bb27b569fd47394b6cb319916c3282de9 (diff)
downloadotp-e21bc712b95b878afd9ab3d93ac27ded0bce7ccf.tar.gz
otp-e21bc712b95b878afd9ab3d93ac27ded0bce7ccf.tar.bz2
otp-e21bc712b95b878afd9ab3d93ac27ded0bce7ccf.zip
Merge branch 'cf/supervisor_shutdown_infinity'
* cf/supervisor_shutdown_infinity: Add a warning to docs about workers' shutdown strategy Allow an infinite timeout to shutdown worker processes OTP-9648
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/supervisor.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index 9da0d52f8c..051dca462b 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -1053,7 +1053,7 @@ validRestartType(RestartType) -> throw({invalid_restart_type, RestartType}).
validShutdown(Shutdown, _)
when is_integer(Shutdown), Shutdown > 0 -> true;
-validShutdown(infinity, supervisor) -> true;
+validShutdown(infinity, _) -> true;
validShutdown(brutal_kill, _) -> true;
validShutdown(Shutdown, _) -> throw({invalid_shutdown, Shutdown}).