From 21c4c0ec0af0e08ff355f75f3e4103e8c6ffa9dd Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 31 Oct 2023 11:07:03 +0100 Subject: Simplify --- .../java/com/yahoo/vespa/config/server/deploy/Deployment.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index f1dd3e725a7..ae1215fd5aa 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -132,13 +132,8 @@ public class Deployment implements com.yahoo.config.provision.Deployment { TimeoutBudget timeoutBudget = params.getTimeoutBudget(); timeoutBudget.assertNotTimedOut(() -> "Timeout exceeded when trying to activate '" + applicationId + "'"); - try { - Activation activation = applicationRepository.activate(session, applicationId, tenant, params.force()); - waitForActivation(applicationId, timeoutBudget, activation); - } catch (Exception e) { - throw e; - } - + Activation activation = applicationRepository.activate(session, applicationId, tenant, params.force()); + waitForActivation(applicationId, timeoutBudget, activation); restartServicesIfNeeded(applicationId); storeReindexing(applicationId, session.getMetaData().getGeneration()); -- cgit v1.2.3