aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-10-26 12:31:27 +0200
committerHans Nilsson <[email protected]>2016-10-27 15:25:03 +0200
commit39cb552ba0a5aaa36cb07526b3b895677ba1f3dc (patch)
tree756e25e80584be28d6361f5a23a56471a62269a5
parentf26d0ba5d3d4c75df593b3406b9f3f3b81560e3c (diff)
downloadotp-39cb552ba0a5aaa36cb07526b3b895677ba1f3dc.tar.gz
otp-39cb552ba0a5aaa36cb07526b3b895677ba1f3dc.tar.bz2
otp-39cb552ba0a5aaa36cb07526b3b895677ba1f3dc.zip
ssh: Add a 'catch' in ssh_channel.erl to prevent double close errors
-rw-r--r--lib/ssh/src/ssh_channel.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 426e2f5125..85b31f3669 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -261,7 +261,7 @@ handle_info({ssh_cm, _, _} = Msg, #state{cm = ConnectionManager,
adjust_window(Msg),
{noreply, State#state{channel_state = ChannelState}, Timeout};
{stop, ChannelId, ChannelState} ->
- ssh_connection:close(ConnectionManager, ChannelId),
+ catch ssh_connection:close(ConnectionManager, ChannelId),
{stop, normal, State#state{close_sent = true,
channel_state = ChannelState}}
end;