diff options
| author | Hans Nilsson <[email protected]> | 2016-05-16 15:39:27 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-05-16 15:39:27 +0200 |
| commit | 8f950e84bf6118211d0ead2fc8988d551b7ec174 (patch) | |
| tree | 1db0ea95821e3ce7ffa70c07e24462f671fd6338 /lib/eldap/src/eldap.erl | |
| parent | 2d1ba918ba32476564c4c92d527d6fbb57db9beb (diff) | |
| parent | cf754c142b387855f1eb2ea87025efdbdb8e3f4a (diff) | |
| download | otp-8f950e84bf6118211d0ead2fc8988d551b7ec174.tar.gz otp-8f950e84bf6118211d0ead2fc8988d551b7ec174.tar.bz2 otp-8f950e84bf6118211d0ead2fc8988d551b7ec174.zip | |
Merge branch 'hairyhum/eldap/ignore_tcp_errors_at_close/PR-1048/OTP-13590'
* hairyhum/eldap/ignore_tcp_errors_at_close/PR-1048/OTP-13590:
indentation
Ignore tcp errors during close request to eldap
Diffstat (limited to 'lib/eldap/src/eldap.erl')
| -rw-r--r-- | lib/eldap/src/eldap.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index dc236f8a44..625309271b 100644 --- a/lib/eldap/src/eldap.erl +++ b/lib/eldap/src/eldap.erl @@ -564,7 +564,12 @@ loop(Cpid, Data) -> ?MODULE:loop(Cpid, NewData); {_From, close} -> - {no_reply,_NewData} = do_unbind(Data), + % Ignore tcp error if connection is already closed. + try do_unbind(Data) of + {no_reply,_NewData} -> ok + catch + throw:{gen_tcp_error, _TcpErr} -> ok + end, unlink(Cpid), exit(closed); |