Merge pull request #26268 from vespa-engine/jonmv/another-try-with-resources

Another try-with-res to preserve any original exception

1 files changed, 6 insertions, 5 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 f6ac4626196..d1545537d48 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
@@ -891,16 +891,17 @@ public class ApplicationController {
      */
     private Optional<LockedApplication> deactivate(ApplicationId instanceId, ZoneId zone, Optional<LockedApplication> application) {
         DeploymentId id = new DeploymentId(instanceId, zone);
-        try {
-            configServer.deactivate(id);
-        } finally {
+        interface CleanCloseable extends AutoCloseable { void close(); }
+        try (CleanCloseable postDeactivation = () -> {
             application.ifPresent(app -> controller.routing().of(id).configure(app.get().deploymentSpec()));
             if (id.zoneId().environment().isManuallyDeployed())
                 applicationStore.putMetaTombstone(id, clock.instant());
-            if (!id.zoneId().environment().isTest())
+            if ( ! id.zoneId().environment().isTest())
                 controller.notificationsDb().removeNotifications(NotificationSource.from(id));
+        }) {
+            configServer.deactivate(id);
+            return application.map(app -> app.with(instanceId.instance(), instance -> instance.withoutDeploymentIn(id.zoneId())));
         }
-        return application.map(app -> app.with(instanceId.instance(), instance -> instance.withoutDeploymentIn(id.zoneId())));
     }
 
     public DeploymentTrigger deploymentTrigger() { return deploymentTrigger; }