From dd22d7ca396f7be82d9a8497b62eb3529c2b522b Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@oath.com>
Date: Mon, 30 Oct 2017 08:48:39 +0100
Subject: Get value from optional before throwing exception

---
 .../com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6b37c20f2b5..dda154a0e94 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);
-- 
cgit v1.2.3