diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-11-14 10:34:37 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-11-14 10:34:37 +0100 |
| commit | f03339650039e4da871df142bd52f65f7aa586c1 (patch) | |
| tree | 491a91dd4a267762d3407293fb1f40f404b676e0 /lib/ssh/src/ssh_channel.erl | |
| parent | ae7ae7d734b980294073ea43923167904349347c (diff) | |
| parent | 19aedb5c0cb956e51b24fbba4923520efe7bf54b (diff) | |
| download | otp-f03339650039e4da871df142bd52f65f7aa586c1.tar.gz otp-f03339650039e4da871df142bd52f65f7aa586c1.tar.bz2 otp-f03339650039e4da871df142bd52f65f7aa586c1.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssh/src/ssh_channel.erl')
| -rw-r--r-- | lib/ssh/src/ssh_channel.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl index 062ed764ca..508ae637cf 100644 --- a/lib/ssh/src/ssh_channel.erl +++ b/lib/ssh/src/ssh_channel.erl @@ -284,7 +284,7 @@ handle_info(Msg, #state{cm = ConnectionManager, channel_cb = Module, terminate(Reason, #state{cm = ConnectionManager, channel_id = ChannelId, close_sent = false} = State) -> - ssh_connection:close(ConnectionManager, ChannelId), + catch ssh_connection:close(ConnectionManager, ChannelId), terminate(Reason, State#state{close_sent = true}); terminate(_, #state{channel_cb = Cb, channel_state = ChannelState}) -> catch Cb:terminate(Cb, ChannelState), |