diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-17 09:36:14 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-17 09:36:14 +0100 |
| commit | 1037acb9cba3f88d9dbd318e6f7f75866b5a5fca (patch) | |
| tree | 22d739a2649ecd6895c8876384d890569dbadcb4 /lib/inets/src/http_client/httpc_manager.erl | |
| parent | 4c736d27d32b5334d8ba978c100a591caf0ac604 (diff) | |
| parent | 6eba2a32f2585bfd1d94fa1066167901213d0408 (diff) | |
| download | otp-1037acb9cba3f88d9dbd318e6f7f75866b5a5fca.tar.gz otp-1037acb9cba3f88d9dbd318e6f7f75866b5a5fca.tar.bz2 otp-1037acb9cba3f88d9dbd318e6f7f75866b5a5fca.zip | |
Merge branch 'ingela/inets/httpc/ERL-473/OTP-14783' into maint
* ingela/inets/httpc/ERL-473/OTP-14783:
inets: Eliminate race condition
Diffstat (limited to 'lib/inets/src/http_client/httpc_manager.erl')
| -rw-r--r-- | lib/inets/src/http_client/httpc_manager.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl index a63864493f..ffdf1603b3 100644 --- a/lib/inets/src/http_client/httpc_manager.erl +++ b/lib/inets/src/http_client/httpc_manager.erl @@ -849,11 +849,11 @@ pipeline_or_keep_alive(#request{id = Id, from = From} = Request, HandlerPid, #state{handler_db = HandlerDb} = State) -> - case (catch httpc_handler:send(Request, HandlerPid)) of + case httpc_handler:send(Request, HandlerPid) of ok -> HandlerInfo = {Id, HandlerPid, From}, ets:insert(HandlerDb, HandlerInfo); - _ -> % timeout pipelining failed + {error, closed} -> % timeout pipelining failed start_handler(Request, State) end. |