diff options
| author | Niclas Eklund <[email protected]> | 2011-01-25 15:00:26 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-01-25 15:00:26 +0100 |
| commit | 14c9ff21544da8b5e195601ea21f9c954ee847da (patch) | |
| tree | 0d5e354eea398d99d99217726572e3e56eebe85b /lib/ssh/src/ssh_connection_manager.erl | |
| parent | 2a49028427217bb7574274280524edee1e7f5d4d (diff) | |
| parent | f0168539740f650cb8a7ef0bf8b51facc40c1563 (diff) | |
| download | otp-14c9ff21544da8b5e195601ea21f9c954ee847da.tar.gz otp-14c9ff21544da8b5e195601ea21f9c954ee847da.tar.bz2 otp-14c9ff21544da8b5e195601ea21f9c954ee847da.zip | |
Merge branch 'maint-r14' into dev
Diffstat (limited to 'lib/ssh/src/ssh_connection_manager.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl index 6bf89224cf..9bfd5270da 100644 --- a/lib/ssh/src/ssh_connection_manager.erl +++ b/lib/ssh/src/ssh_connection_manager.erl @@ -147,7 +147,7 @@ close(ConnectionManager, ChannelId) -> try call(ConnectionManager, {close, ChannelId}) of ok -> ok; - {error,normal} -> + {error, channel_closed} -> ok catch exit:{noproc, _} -> @@ -158,7 +158,7 @@ stop(ConnectionManager) -> try call(ConnectionManager, stop) of ok -> ok; - {error,normal} -> + {error, channel_closed} -> ok catch exit:{noproc, _} -> @@ -604,7 +604,7 @@ call(Pid, Msg, Timeout) -> exit:{timeout, _} -> {error, timeout}; exit:{normal, _} -> - {error, normal} + {error, channel_closed} end. cast(Pid, Msg) -> |