Repository: trafficserver Updated Branches: refs/heads/master 63ae314a5 -> 20eaf0e4c
Correctly mark the file update as inactive once the swap has been completed Fixup from TS-3725 Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/20eaf0e4 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/20eaf0e4 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/20eaf0e4 Branch: refs/heads/master Commit: 20eaf0e4cd6e1ea30df5f6099198ee167eed5984 Parents: 63ae314 Author: Thomas Jackson <[email protected]> Authored: Tue Jul 7 18:49:38 2015 -0700 Committer: Thomas Jackson <[email protected]> Committed: Tue Jul 7 19:01:23 2015 -0700 ---------------------------------------------------------------------- iocore/hostdb/HostDB.cc | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/20eaf0e4/iocore/hostdb/HostDB.cc ---------------------------------------------------------------------- diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc index ec4c463..72d86f5 100644 --- a/iocore/hostdb/HostDB.cc +++ b/iocore/hostdb/HostDB.cc @@ -2684,4 +2684,6 @@ ParseHostFile(char const *path) hostDB.hosts_file_ptr = parsed_hosts_file_ptr; // Make a new map, so we can do it all again parsed_hosts_file_ptr = new RefCountedHostsFileMap(); + // Mark this one as completed, so we can allow another update to happen + HostDBFileUpdateActive = 0; }
