Repository: mesos Updated Branches: refs/heads/master 3a88c8509 -> dcc8bd7d2
Avoided using integers as booleans. This is a follow up action for https://reviews.apache.org/r/49352/, we should avoid using integers as booleans in favor of explicitly checking the condition we care about. Review: https://reviews.apache.org/r/50423/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dcc8bd7d Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dcc8bd7d Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dcc8bd7d Branch: refs/heads/master Commit: dcc8bd7d2a942889fe473c21ab64e863d0e6a13f Parents: 3a88c85 Author: Guangya Liu <gyliu...@gmail.com> Authored: Tue Aug 23 13:55:30 2016 -0700 Committer: Jie Yu <yujie....@gmail.com> Committed: Tue Aug 23 13:55:30 2016 -0700 ---------------------------------------------------------------------- src/docker/docker.cpp | 2 +- src/slave/containerizer/mesos/containerizer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/dcc8bd7d/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index e07c4aa..0a66046 100755 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -470,7 +470,7 @@ Try<Docker::Image> Docker::Image::create(const JSON::Object& json) return Error("Unexpected Env format for 'ContainerConfig.Env'"); } - if (result.count(tokens[0])) { + if (result.count(tokens[0]) > 0) { return Error("Unexpected duplicate environment variables '" + tokens[0] + "'"); } http://git-wip-us.apache.org/repos/asf/mesos/blob/dcc8bd7d/src/slave/containerizer/mesos/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp index 1cd3b38..8a8985a 100644 --- a/src/slave/containerizer/mesos/containerizer.cpp +++ b/src/slave/containerizer/mesos/containerizer.cpp @@ -1088,7 +1088,7 @@ Future<bool> MesosContainerizerProcess::_launch( const string& name = variable.name(); const string& value = variable.value(); - if (environment.count(name)) { + if (environment.count(name) > 0) { VLOG(1) << "Overwriting environment variable '" << name << "', original: '" << environment[name] << "', new: '" @@ -1145,7 +1145,7 @@ Future<bool> MesosContainerizerProcess::_launch( const string& name = variable.name(); const string& value = variable.value(); - if (environment.count(name)) { + if (environment.count(name) > 0) { VLOG(1) << "Overwriting environment variable '" << name << "', original: '" << environment[name] << "', new: '"