Simplify getting maintained deployments info

1 files changed, 3 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 1df0b1bca51..ac2d0373d9c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -331,14 +331,10 @@ public class ApplicationController {
                                                applicationPackage.zippedContent());
             preparedApplication.activate();
 
-            Deployment previousDeployment = application.deployments().get(zone);
-            Deployment newDeployment = previousDeployment;
-            if (previousDeployment == null) {
-                newDeployment = new Deployment(zone, revision, version, clock.instant());
-            } else {
-                newDeployment = new Deployment(zone, revision, version, clock.instant(),
+            // Use info from previous deployments is available
+            Deployment previousDeployment = application.deployments().getOrDefault(zone, new Deployment(zone, revision, version, clock.instant()));
+            Deployment newDeployment = new Deployment(zone, revision, version, clock.instant(),
                         previousDeployment.clusterUtils(), previousDeployment.clusterInfo(), previousDeployment.metrics());
-            }
 
             application = application.with(newDeployment);
             store(application, lock);