diff options
| author | Erlang/OTP <[email protected]> | 2019-01-15 19:35:04 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-01-15 19:35:04 +0100 |
| commit | 67867c639aa760d0dfab8e57f5bee1566c1be6e0 (patch) | |
| tree | 3659a889866b2bcf6e476b368a5d0c56861029d0 /lib/ssl/src/ssl_connection.erl | |
| parent | 788b9bd0d7ef518fb58fe70793357eec47cd8671 (diff) | |
| parent | 23b258560d28924b80677e96730a7292a2405e1e (diff) | |
| download | otp-67867c639aa760d0dfab8e57f5bee1566c1be6e0.tar.gz otp-67867c639aa760d0dfab8e57f5bee1566c1be6e0.tar.bz2 otp-67867c639aa760d0dfab8e57f5bee1566c1be6e0.zip | |
Merge branch 'ingela/ssl/enhance-error-handling/OTP-15505' into maint-21
* ingela/ssl/enhance-error-handling/OTP-15505:
ssl: Cuddle test cases
ssl: Fix test case
ssl: Fix two invalid gen_statem returns
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 390bdf0810..0e2a677273 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1177,7 +1177,7 @@ handle_call({shutdown, read_write = How}, From, StateName, ok -> {next_state, StateName, State#state{terminated = true}, [{reply, From, ok}]}; Error -> - {stop, StateName, State#state{terminated = true}, [{reply, From, Error}]} + {stop_and_reply, {shutdown, normal}, {reply, From, Error}, State#state{terminated = true}} end catch throw:Return -> @@ -1190,7 +1190,7 @@ handle_call({shutdown, How0}, From, StateName, ok -> {next_state, StateName, State, [{reply, From, ok}]}; Error -> - {stop, StateName, State, [{reply, From, Error}]} + {stop_and_reply, {shutdown, normal}, {reply, From, Error}, State} end; handle_call({recv, _N, _Timeout}, From, _, #state{socket_options = |