diff options
author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-09-06 12:05:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-06 12:05:42 +0200 |
commit | 617fdc61b6c28e188489a28ac334290f85ef71d4 (patch) | |
tree | 3379afdd4b3dc3fafc42393e30f897119d33145a /controller-server | |
parent | bb3551fd47bf2ffd6e2e1e8b546d31af5ba68427 (diff) | |
parent | a96722821ee4d52dbe112e0d9da6839dcecccb9d (diff) |
Merge pull request #10534 from vespa-engine/jvenstad/view-active-run-over-historic-when-disagreement
See unfinished run over finished copy when inconsistent state
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 3f808f91310..282e83461ea 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -173,7 +173,7 @@ public class JobController { /** Returns an immutable map of all known runs for the given application and job type. */ public Map<RunId, Run> runs(ApplicationId id, JobType type) { SortedMap<RunId, Run> runs = curator.readHistoricRuns(id, type); - last(id, type).ifPresent(run -> runs.putIfAbsent(run.id(), run)); + last(id, type).ifPresent(run -> runs.put(run.id(), run)); return ImmutableMap.copyOf(runs); } |