Updated Branches: refs/heads/master e5cf7360a -> e1875ce9f
Fixed MESOS-870: The slave's http endpoint can crash the slave. Review: https://reviews.apache.org/r/16072 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e1875ce9 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e1875ce9 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e1875ce9 Branch: refs/heads/master Commit: e1875ce9f06eec3db6c185aa39c6115741e21d3d Parents: e5cf736 Author: Benjamin Mahler <bmah...@twitter.com> Authored: Thu Dec 5 17:48:56 2013 -0800 Committer: Benjamin Mahler <bmah...@twitter.com> Committed: Thu Dec 5 17:49:02 2013 -0800 ---------------------------------------------------------------------- src/slave/http.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/e1875ce9/src/slave/http.cpp ---------------------------------------------------------------------- diff --git a/src/slave/http.cpp b/src/slave/http.cpp index 3316fdf..1358810 100644 --- a/src/slave/http.cpp +++ b/src/slave/http.cpp @@ -332,9 +332,11 @@ Future<Response> Slave::Http::state(const Request& request) object.values["failed_tasks"] = slave.stats.tasks[TASK_FAILED]; object.values["lost_tasks"] = slave.stats.tasks[TASK_LOST]; - Try<string> masterHostname = net::getHostname(slave.master.get().ip); - if (masterHostname.isSome()) { - object.values["master_hostname"] = masterHostname.get(); + if (slave.master.isSome()) { + Try<string> masterHostname = net::getHostname(slave.master.get().ip); + if (masterHostname.isSome()) { + object.values["master_hostname"] = masterHostname.get(); + } } if (slave.flags.log_dir.isSome()) {