From 0534c1018cf48540331ea2e0aed8ef9b6cd14717 Mon Sep 17 00:00:00 2001 From: andreer Date: Fri, 18 Jan 2019 11:21:56 +0100 Subject: check for version.isUnknown instead of null --- .../controller/restapi/application/ApplicationApiHandler.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 1714294d2eb..16e56a08612 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -875,11 +875,12 @@ public class ApplicationApiHandler extends LoggingRequestHandler { if(!deployment.isPresent()) throw new IllegalArgumentException("Can't redeploy application, no deployment currently exist"); - applicationVersion = Optional.ofNullable(deployment.get().applicationVersion()); - if(!applicationVersion.isPresent()) + ApplicationVersion version = deployment.get().applicationVersion(); + if(version.isUnknown()) throw new IllegalArgumentException("Can't redeploy application, application version is unknown"); - vespaVersion = Optional.ofNullable(deployment.get().version()); + applicationVersion = Optional.of(version); + vespaVersion = Optional.of(deployment.get().version()); applicationPackage = Optional.of(controller.applications().getApplicationPackage(controller.applications().require(applicationId), applicationVersion.get())); } -- cgit v1.2.3