From 0302c7698e061925dd26017464be74744b616bdb Mon Sep 17 00:00:00 2001 From: Peter Kolloch Date: Fri, 27 Mar 2015 16:51:16 +0100 Subject: [PATCH] Fix merge error between PR #1130 and #1107 commit 8e30672398950cb188bca797da4d85215922821a Merge: 6f1aff3 3ec8f59 Author: Peter Kolloch Date: Fri Mar 27 16:07:26 2015 +0100 Merge pull request #1107 from mesosphere/wip-1106-drexin fixes #1106 - Return empty HealthCheck result instead of None, when no r... --- .../scala/mesosphere/marathon/api/v2/AppTasksResource.scala | 2 +- src/main/scala/mesosphere/marathon/api/v2/TasksResource.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/mesosphere/marathon/api/v2/AppTasksResource.scala b/src/main/scala/mesosphere/marathon/api/v2/AppTasksResource.scala index db039d63835..b6847de2b9d 100644 --- a/src/main/scala/mesosphere/marathon/api/v2/AppTasksResource.scala +++ b/src/main/scala/mesosphere/marathon/api/v2/AppTasksResource.scala @@ -35,7 +35,7 @@ class AppTasksResource @Inject() (service: MarathonSchedulerService, id <- appIds health = result(healthCheckManager.statuses(id)) task <- taskTracker.get(id) - } yield EnrichedTask(id, task, health.getOrElse(task.getId, Nil).map(Some(_))) + } yield EnrichedTask(id, task, health.getOrElse(task.getId, Nil)) val matchingApps = appId match { case GroupTasks(gid) => diff --git a/src/main/scala/mesosphere/marathon/api/v2/TasksResource.scala b/src/main/scala/mesosphere/marathon/api/v2/TasksResource.scala index f4345b110d4..a76853994ea 100644 --- a/src/main/scala/mesosphere/marathon/api/v2/TasksResource.scala +++ b/src/main/scala/mesosphere/marathon/api/v2/TasksResource.scala @@ -57,7 +57,7 @@ class TasksResource @Inject() ( EnrichedTask( appId, task, - health.getOrElse(task.getId, Nil).map(Some(_)), + health.getOrElse(task.getId, Nil), appToPorts.getOrElse(appId, Nil) ) }