From aa225961235500ec6be406725de7fac4e06172a7 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 14 Apr 2020 14:06:45 +0200 Subject: Rename variable --- .../java/com/yahoo/vespa/config/server/deploy/Deployment.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configserver') 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 2c5c37c3f0b..82dc17c3678 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 @@ -131,12 +131,12 @@ public class Deployment implements com.yahoo.config.provision.Deployment { TimeoutBudget timeoutBudget = new TimeoutBudget(clock, timeout); ApplicationId applicationId = session.getApplicationId(); - LocalSession currentActiveSession; + LocalSession previousActiveSession; try (Lock lock = tenant.getApplicationRepo().lock(applicationId)) { validateSessionStatus(session); NestedTransaction transaction = new NestedTransaction(); - currentActiveSession = applicationRepository.getActiveSession(applicationId); - transaction.add(deactivateCurrentActivateNew(currentActiveSession, session, ignoreSessionStaleFailure)); + previousActiveSession = applicationRepository.getActiveSession(applicationId); + transaction.add(deactivateCurrentActivateNew(previousActiveSession, session, ignoreSessionStaleFailure)); hostProvisioner.ifPresent(provisioner -> provisioner.activate(transaction, applicationId, session.getAllocatedHosts().getHosts())); transaction.commit(); } @@ -153,7 +153,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { " activated successfully using " + (hostProvisioner.isPresent() ? hostProvisioner.get().getClass().getSimpleName() : "no host provisioner") + ". Config generation " + session.getMetaData().getGeneration() + - (currentActiveSession != null ? ". Activated session based on previous active session " + currentActiveSession.getSessionId() : "") + + (previousActiveSession != null ? ". Activated session based on previous active session " + previousActiveSession.getSessionId() : "") + ". File references used: " + applicationRepository.getFileReferences(applicationId)); } } -- cgit v1.2.3