diff options
| author | Henrik Nord <[email protected]> | 2014-09-30 09:39:51 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-09-30 09:39:51 +0200 |
| commit | 88d5c0edbd08e069bc20cf13fa90bca59eb43e86 (patch) | |
| tree | bef481b72ffa142b7a9fb1ee9e5be969e3e7093e /lib/ssh/src/ssh_system_sup.erl | |
| parent | 6b240f6d882a10707ff2dea4e171a2d9599b3746 (diff) | |
| parent | ee24a87a779d8d10461cadd47b3eb276e70baef8 (diff) | |
| download | otp-88d5c0edbd08e069bc20cf13fa90bca59eb43e86.tar.gz otp-88d5c0edbd08e069bc20cf13fa90bca59eb43e86.tar.bz2 otp-88d5c0edbd08e069bc20cf13fa90bca59eb43e86.zip | |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
lib/ssh/test/ssh_connection_SUITE.erl
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). |