summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-09-14 12:42:06 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-09-14 12:42:06 +0200
commit3820e9249d8ee79e3e1bd6879f5136e0587b7764 (patch)
tree287d9080a8f8967171c32f004023bcd8660532f4 /controller-server
parent64e7bb2d7c51deb181308aac7fd92675f2d29d1d (diff)
Revert "Revert PR 6944"
This reverts commit c2da936dbeda0eb4bf919f42db66aacaf10b41bb.
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
index f51f292299d..8fbba05ccbc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java
@@ -278,8 +278,8 @@ class JobControllerApiHandlerHelper {
private static String statusOf(Controller controller, ApplicationId id, JobType type, Versions versions) {
return controller.jobController().last(id, type)
- .filter(run -> versions.targetsMatch(versions))
- .filter(run -> type == systemTest || versions.sourcesMatchIfPresent(versions))
+ .filter(run -> run.versions().targetsMatch(versions))
+ .filter(run -> type == systemTest || run.versions().sourcesMatchIfPresent(versions))
.map(JobControllerApiHandlerHelper::taskStatusOf)
.orElse("pending");
}