aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-10-25 12:16:36 +0200
committerNiclas Eklund <[email protected]>2010-10-25 12:16:36 +0200
commit00d27caa001444e65e9dd3a7d3bc65cfde4b5866 (patch)
treee26c670b0c288961e5164df80415f11b7c4ca39f /lib/ssh/src
parent644d0c54643eda5216a1fa0ff012d1ebcae5ce8e (diff)
downloadotp-00d27caa001444e65e9dd3a7d3bc65cfde4b5866.tar.gz
otp-00d27caa001444e65e9dd3a7d3bc65cfde4b5866.tar.bz2
otp-00d27caa001444e65e9dd3a7d3bc65cfde4b5866.zip
The fix regarding OTP-8863 was not included in the previous version as stated
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh.appup.src2
-rw-r--r--lib/ssh/src/ssh_system_sup.erl4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 09249e5e39..160e336873 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,6 +19,7 @@
{"%VSN%",
[
+ {"1.1.12", [{load_module, ssh_system_sup, soft_purge, soft_purge, []}]},
{"1.1.11", [{restart_application, ssh}]},
{"1.1.10", [{restart_application, ssh}]},
{"1.1.9", [{restart_application, ssh}]},
@@ -31,6 +32,7 @@
{"1.1.2", [{restart_application, ssh}]}
],
[
+ {"1.1.12", [{load_module, ssh_system_sup, soft_purge, soft_purge, []}]},
{"1.1.11", [{restart_application, ssh}]},
{"1.1.10", [{restart_application, ssh}]},
{"1.1.9", [{restart_application, ssh}]},
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 0ff73f1648..d1003e12f2 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-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -85,7 +85,7 @@ start_subsystem(SystemSup, Options) ->
supervisor:start_child(SystemSup, Spec).
stop_subsystem(SystemSup, SubSys) ->
- case lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of
+ case catch lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of
false ->
{error, not_found};
{Id, _, _, _} ->