diff options
author | andreer <andreer@oath.com> | 2019-01-18 11:21:56 +0100 |
---|---|---|
committer | andreer <andreer@oath.com> | 2019-01-18 11:21:56 +0100 |
commit | 0534c1018cf48540331ea2e0aed8ef9b6cd14717 (patch) | |
tree | 7b79ac5a8275fc4c7562a41f4af8c23978aae5f3 | |
parent | bc653fbba2314b1c7b42ef9ad81bec05d715dedd (diff) |
check for version.isUnknown instead of null
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java | 7 |
1 files changed, 4 insertions, 3 deletions
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())); } |