Changed HTTP task modeling to use Labels. Review: https://reviews.apache.org/r/28576
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1b3d171e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1b3d171e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1b3d171e Branch: refs/heads/master Commit: 1b3d171eb1b44a6dc6f0212316c3f98274b2aea0 Parents: ca55557 Author: Niklas Nielsen <[email protected]> Authored: Wed Dec 3 16:38:30 2014 -0800 Committer: Niklas Q. Nielsen <[email protected]> Committed: Wed Dec 3 17:11:22 2014 -0800 ---------------------------------------------------------------------- src/common/http.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/1b3d171e/src/common/http.cpp ---------------------------------------------------------------------- diff --git a/src/common/http.cpp b/src/common/http.cpp index 422fa68..0d0d52f 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -132,8 +132,10 @@ JSON::Object model(const Task& task) object.values["statuses"] = array; JSON::Array labels; - foreach (const Label& label, task.labels()) { - labels.values.push_back(JSON::Protobuf(label)); + if (task.has_labels()) { + foreach (const Label& label, task.labels().labels()) { + labels.values.push_back(JSON::Protobuf(label)); + } } object.values["labels"] = labels; @@ -170,8 +172,10 @@ JSON::Object model( object.values["statuses"] = array; JSON::Array labels; - foreach (const Label& label, task.labels()) { - labels.values.push_back(JSON::Protobuf(label)); + if (task.has_labels()) { + foreach (const Label& label, task.labels().labels()) { + labels.values.push_back(JSON::Protobuf(label)); + } } object.values["labels"] = labels;
