aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-10-07 10:32:55 +0200
committerIngela Anderton Andin <[email protected]>2016-10-07 10:32:55 +0200
commit1f0ce3e83982c80a84e31ab16a89dd65b45157f8 (patch)
tree8b09f5d62ac43d00eeae99b7a098800696334ac6 /lib
parent8dc0a2dcbf95739c579280822665838a7ebed32b (diff)
parent763971712d6c8fad295ecc42ea30c30b013dfd84 (diff)
downloadotp-1f0ce3e83982c80a84e31ab16a89dd65b45157f8.tar.gz
otp-1f0ce3e83982c80a84e31ab16a89dd65b45157f8.tar.bz2
otp-1f0ce3e83982c80a84e31ab16a89dd65b45157f8.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/src/http_client/httpc_handler.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index e223292613..59cb1299e9 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1846,10 +1846,13 @@ update_session(ProfileName, #session{id = SessionId} = Session, Pos, Value) ->
httpc_manager:update_session(ProfileName, SessionId, Pos, Value)
end
catch
- error:undef -> % This could happen during code upgrade
+ error:undef -> %% This could happen during code upgrade
Session2 = erlang:setelement(Pos, Session, Value),
insert_session(Session2, ProfileName);
- T:E ->
+ error:badarg ->
+ exit(normal); %% Manager has been shutdown
+ T:E ->
+ %% Unexpected this must be an error!
Stacktrace = erlang:get_stacktrace(),
error_logger:error_msg("Failed updating session: "
"~n ProfileName: ~p"