From b9a7003314280a22ea145758542b6a96c75a139a Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 28 Aug 2012 11:09:08 +0200
Subject: ssh: Correct error handling of ssh connect

---
 lib/ssh/src/ssh_connection_sup.erl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/ssh/src/ssh_connection_sup.erl')

diff --git a/lib/ssh/src/ssh_connection_sup.erl b/lib/ssh/src/ssh_connection_sup.erl
index e3544af1c6..b620056310 100644
--- a/lib/ssh/src/ssh_connection_sup.erl
+++ b/lib/ssh/src/ssh_connection_sup.erl
@@ -48,8 +48,12 @@ start_manager_child(Sup, Args) ->
     supervisor:start_child(Sup, Spec).
 
 connection_manager(SupPid) -> 
-    Children = supervisor:which_children(SupPid),
-    {ok, ssh_connection_manager(Children)}.
+    try supervisor:which_children(SupPid) of
+	Children ->
+	    {ok, ssh_connection_manager(Children)}
+    catch exit:{noproc,_} ->
+	    {ok, undefined}
+    end.
 
 %%%=========================================================================
 %%%  Supervisor callback
@@ -107,6 +111,8 @@ handler_spec([Role, Socket, Opts]) ->
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
+ssh_connection_manager([]) ->
+    undefined;
 ssh_connection_manager([{_, Child, _, [ssh_connection_manager]} | _]) ->
     Child;
 ssh_connection_manager([_ | Rest]) ->
-- 
cgit v1.2.3