commit afe994774266154c544f5efc37f31a74cbf8a200
author Benjamin Mahler <bmahler@twitter.com> Thu Dec 05 17:48:56 2013 -0800
committer Benjamin Mahler <bmahler@twitter.com> Sun Dec 08 23:05:08 2013 -0800
tree e905ff3c284ef4fd9f78a3570503fe78db3a709d
parent f9cf0353b98433ab5d40c3dd9c62fccd4eb40e7a

Fixed MESOS-870: The slave's http endpoint can crash the slave.

Review: https://reviews.apache.org/r/16072

src/slave/http.cpp

diff --git a/src/slave/http.cpp b/src/slave/http.cpp
index 55a5e7d..f164f25 100644
--- a/src/slave/http.cpp
+++ b/src/slave/http.cpp
@@ -319,9 +319,11 @@
   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()) {