Merge branch 'ia/ssh/shutdown-bug' into maint

* ia/ssh/shutdown-bug:
  ssh:close/1 will no longer crash if ssl manager already happens to have been terminated.

1 files changed, 9 insertions, 13 deletions

diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index 406a042d72..e993f597a5 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -144,27 +144,21 @@ adjust_window(ConnectionManager, Channel, Bytes) ->
     cast(ConnectionManager, {adjust_window, Channel, Bytes}).
 
 close(ConnectionManager, ChannelId) ->
-    try call(ConnectionManager, {close, ChannelId}) of
-	  ok ->
+    case call(ConnectionManager, {close, ChannelId}) of
+	ok ->
 	    ok;
-	  {error, channel_closed} ->
-	    ok
-    catch
-	exit:{noproc, _} ->
+	{error, channel_closed} ->
 	    ok
-    end.
+    end.	
 
 stop(ConnectionManager) ->
-    try call(ConnectionManager, stop) of
+    case call(ConnectionManager, stop) of
 	ok ->
 	    ok;
 	{error, channel_closed} ->
 	    ok
-    catch
-	exit:{noproc, _} ->
-	    ok
     end.
-
+			
 send(ConnectionManager, ChannelId, Type, Data, Timeout) ->
     call(ConnectionManager, {data, ChannelId, Type, Data}, Timeout).
 
@@ -591,7 +585,9 @@ call(Pid, Msg, Timeout) ->
     catch
 	exit:{timeout, _} ->
 	    {error, timeout};
-	exit:{normal, _} ->
+	exit:{normal} ->
+	    {error, channel_closed};
+	exit:{{shutdown, _}, _} ->
 	    {error, channel_closed};
 	exit:{noproc,_} ->
 	    {error, channel_closed}