diff options
author | Martin Polden <mpolden@mpolden.no> | 2017-10-30 08:54:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 08:54:16 +0100 |
commit | d05588295d1e213cc14c0cddbd15143eca05af0c (patch) | |
tree | 9703a7b3dcdbb967c4becb68294023211e457775 | |
parent | 09edaa57cd7fa6a7f6b2335767d22f61451ae5b4 (diff) | |
parent | dd22d7ca396f7be82d9a8497b62eb3529c2b522b (diff) |
Merge pull request #3941 from vespa-engine/hmusum/get-optional-before-throwing-exception
Get value from optional before throwing exception
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index 00300099493..11074e1a68e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -243,7 +243,7 @@ public class DeploymentTrigger { Application application = applications().require(applicationId); if (application.deploying().isPresent() && ! application.deploymentJobs().hasFailures()) throw new IllegalArgumentException("Could not start " + change + " on " + application + ": " + - application.deploying() + " is already in progress"); + application.deploying().get() + " is already in progress"); application = application.withDeploying(Optional.of(change)); if (change instanceof Change.ApplicationChange) application = application.withOutstandingChange(false); |