diff options
| author | Raimo Niskanen <[email protected]> | 2019-03-04 13:15:19 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-03-04 13:15:19 +0100 |
| commit | 0341e571fb1d16415b5663366f3128ba4dfbd123 (patch) | |
| tree | b75fee87ba04934cfadbaae1c2a9afdc0ccc71ab /lib/kernel/src | |
| parent | 91498c1b747337977200d668e3165ab490775055 (diff) | |
| parent | a084f6470369dbad42833e0c6f619ecab092ec09 (diff) | |
| download | otp-0341e571fb1d16415b5663366f3128ba4dfbd123.tar.gz otp-0341e571fb1d16415b5663366f3128ba4dfbd123.tar.bz2 otp-0341e571fb1d16415b5663366f3128ba4dfbd123.zip | |
Merge branch 'maint'
* maint:
Set early enough start time
inet_db: fix a bug when .hosts file is never reloaded
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/inet_db.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/kernel/src/inet_db.erl b/lib/kernel/src/inet_db.erl index 6cbb6ac2da..3f5a2ea5ee 100644 --- a/lib/kernel/src/inet_db.erl +++ b/lib/kernel/src/inet_db.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2016. All Rights Reserved. +%% Copyright Ericsson AB 1997-2019. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -1223,7 +1223,10 @@ handle_set_file(Option, Fname, TagTm, TagInfo, ParseFun, From, {ok, B, _} -> B; _ -> <<>> end; - _ -> <<>> + _ -> + ets:insert(Db, {TagInfo, undefined}), + TimeZero = - (?RES_FILE_UPDATE_TM + 1), % Early enough + ets:insert(Db, {TagTm, TimeZero}) end, handle_set_file(ParseFun, Bin, From, State); false -> {reply,error,State} |