diff options
| author | Erlang/OTP <[email protected]> | 2014-09-29 08:59:49 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-09-29 08:59:49 +0200 |
| commit | e218a4578f0ea24fb846ee433d48df98040ff573 (patch) | |
| tree | bf3ce7b7f86235450e5267e43632ef4c116be1b0 /lib/ssh/src/ssh_system_sup.erl | |
| parent | ee4af1e0736f0ae1661fecd63c05c24c4067e4ea (diff) | |
| parent | 19aa8b2e1e11f1da4723dbcce427831eca17d54e (diff) | |
| download | otp-e218a4578f0ea24fb846ee433d48df98040ff573.tar.gz otp-e218a4578f0ea24fb846ee433d48df98040ff573.tar.bz2 otp-e218a4578f0ea24fb846ee433d48df98040ff573.zip | |
Merge branch 'ia/ssh/listner-restart/OTP-12168' into maint-17
* ia/ssh/listner-restart/OTP-12168:
ssh: Adjust supervisor tree to make sure new listning options are honored
ssh: Add test case for ssh:stop_listner
Diffstat (limited to 'lib/ssh/src/ssh_system_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_system_sup.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index 848133f838..660fe8bb65 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -173,8 +173,8 @@ ssh_acceptor_sup([_ | Rest]) -> ssh_acceptor_sup(Rest). stop_acceptor(Sup) -> - [Name] = - [SupName || {SupName, _, _, [ssh_acceptor_sup]} <- + [{Name, AcceptorSup}] = + [{SupName, ASup} || {SupName, ASup, _, [ssh_acceptor_sup]} <- supervisor:which_children(Sup)], - supervisor:terminate_child(Sup, Name). + supervisor:terminate_child(AcceptorSup, Name). |