summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-09-12 22:14:23 +0200
committerHarald Musum <musum@oath.com>2017-09-12 22:14:23 +0200
commit41bdd8022fa961d6390cc0281300c7c48aeba1d1 (patch)
treed79c7beccc9e4f8501236340c16e49187a434678
parent3ca4ca6f6f745f4824f371c2096e298689be31d3 (diff)
Handle case where step cannot be found
* Avoid doing get() unconditionally on an optional
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java2
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 */