Repository: mesos Updated Branches: refs/heads/master 0a9bfe193 -> 0bb1f4496
Fixed a bug around temporaries in `src/master/http.cpp`. Review: https://reviews.apache.org/r/57319 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3e2f7824 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3e2f7824 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3e2f7824 Branch: refs/heads/master Commit: 3e2f78246d3f7a1c5d329e48a6a0d2231bff88fc Parents: 0a9bfe1 Author: Michael Park <[email protected]> Authored: Sat Mar 4 19:19:03 2017 -0800 Committer: Michael Park <[email protected]> Committed: Mon Mar 6 15:07:13 2017 -0800 ---------------------------------------------------------------------- src/master/http.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/3e2f7824/src/master/http.cpp ---------------------------------------------------------------------- diff --git a/src/master/http.cpp b/src/master/http.cpp index 0bbb922..58503ce 100644 --- a/src/master/http.cpp +++ b/src/master/http.cpp @@ -3411,15 +3411,14 @@ Future<vector<string>> Master::Http::_roles( const hashset<string>& whitelist = master->roleWhitelist.get(); roleList.insert(whitelist.begin(), whitelist.end()); } else { - roleList.insert( - master->activeRoles.keys().begin(), - master->activeRoles.keys().end()); - roleList.insert( - master->weights.keys().begin(), - master->weights.keys().end()); - roleList.insert( - master->quotas.keys().begin(), - master->quotas.keys().end()); + hashset<string> roles = master->activeRoles.keys(); + roleList.insert(roles.begin(), roles.end()); + + hashset<string> weights = master->weights.keys(); + roleList.insert(weights.begin(), weights.end()); + + hashset<string> quotas = master->quotas.keys(); + roleList.insert(quotas.begin(), quotas.end()); } vector<string> filteredRoleList;
