aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-06-12 14:48:27 +0200
committerIngela Anderton Andin <[email protected]>2012-06-12 14:48:27 +0200
commit628d51fd2171cb6e8275f9a16d85300e42e83594 (patch)
tree576c61a7cbbb261437b898c3f27fb77ebb3e648e /lib
parent3341122a92e71ade3edc7ecaadab9f55da29e20d (diff)
parent2922ade39abe53463435182d13c8b0da8d375847 (diff)
downloadotp-628d51fd2171cb6e8275f9a16d85300e42e83594.tar.gz
otp-628d51fd2171cb6e8275f9a16d85300e42e83594.tar.bz2
otp-628d51fd2171cb6e8275f9a16d85300e42e83594.zip
Merge branch 'ia/ssh/missing-reason-in-catch-exit/OTP-10112' into maint
* ia/ssh/missing-reason-in-catch-exit/OTP-10112: Improved handling of multiple closes
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/src/ssh_connection_manager.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index a0ea04a2c2..e53cd4f4f7 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -586,7 +586,7 @@ call(Pid, Msg, Timeout) ->
catch
exit:{timeout, _} ->
{error, timeout};
- exit:{normal} ->
+ exit:{normal, _} ->
{error, channel_closed};
exit:{{shutdown, _}, _} ->
{error, channel_closed};