diff options
| author | Martin Polden <mpolden@mpolden.no> | 2017-09-12 22:40:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 22:40:48 +0200 |
| commit | c7d8f1d90ff8904e5449f62c3482a93d1dc8049f (patch) | |
| tree | 5b0a00873b2d12a26b2b9604d69e688d578213d8 | |
| parent | cabb82631fd22cc555834105c37c491e7b36d62c (diff) | |
| parent | 41bdd8022fa961d6390cc0281300c7c48aeba1d1 (diff) | |
Merge pull request #3397 from vespa-engine/hmusum/handle-step-not-found-from-job
Handle case where step cannot be found
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java index 448ab419853..a4ec0b16c38 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java @@ -87,7 +87,7 @@ public class DeploymentOrder { return false; } DeploymentSpec.Step lastStep = deploymentSteps.get(deploymentSteps.size() - 1); - return fromJob(job, application).get().equals(lastStep); + return fromJob(job, application).map(s -> s.equals(lastStep)).orElse(false); } /** Returns jobs for given deployment spec, in the order they are declared */ |