diff options
| author | Hans Nilsson <[email protected]> | 2018-05-17 15:59:44 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-05-17 15:59:44 +0200 |
| commit | f8de655b70b91d72d90e39afae3d5cbe2678c75a (patch) | |
| tree | 01ac618c14b282d60490cf99a08284bb7c277c43 /lib/ssh | |
| parent | 3abf8d89a490f57024b4f5a6c565b40dabb74a1f (diff) | |
| parent | bf852e0a6f893efbbaa9ef4927ec6ba7ba80c101 (diff) | |
| download | otp-f8de655b70b91d72d90e39afae3d5cbe2678c75a.tar.gz otp-f8de655b70b91d72d90e39afae3d5cbe2678c75a.tar.bz2 otp-f8de655b70b91d72d90e39afae3d5cbe2678c75a.zip | |
Merge branch 'hans/ssh/channel_cb_reason/OTP-15084'
* hans/ssh/channel_cb_reason/OTP-15084:
ssh: Terminate reason was always the name of the called callback module
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_client_channel.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_client_channel.erl b/lib/ssh/src/ssh_client_channel.erl index f20007baaf..134d3f08bd 100644 --- a/lib/ssh/src/ssh_client_channel.erl +++ b/lib/ssh/src/ssh_client_channel.erl @@ -305,8 +305,8 @@ terminate(Reason, #state{cm = ConnectionManager, close_sent = false} = State) -> 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), +terminate(Reason, #state{channel_cb = Cb, channel_state = ChannelState}) -> + catch Cb:terminate(Reason, ChannelState), ok. %%-------------------------------------------------------------------- |