diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-06-12 14:49:46 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-06-12 14:49:46 +0200 |
| commit | b1f82aa8aa1f930d3125068c33198aefa93abdcd (patch) | |
| tree | 1162d9bb869e0bcf9a34f8e96965ab94535b41c5 /lib | |
| parent | 1fc1233587a00b318ce15fd520b057dee726a7fc (diff) | |
| parent | 628d51fd2171cb6e8275f9a16d85300e42e83594 (diff) | |
| download | otp-b1f82aa8aa1f930d3125068c33198aefa93abdcd.tar.gz otp-b1f82aa8aa1f930d3125068c33198aefa93abdcd.tar.bz2 otp-b1f82aa8aa1f930d3125068c33198aefa93abdcd.zip | |
Merge branch 'maint'
* maint:
Improved handling of multiple closes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 2 |
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}; |