summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-04-14 14:06:45 +0200
committerHarald Musum <musum@verizonmedia.com>2020-04-14 14:06:45 +0200
commitaa225961235500ec6be406725de7fac4e06172a7 (patch)
tree60664ce98107960c97f5373c89018d7e4cecbcbb /configserver
parentfad6dddafe0b638ef6c2112ae842bca757b55098 (diff)
Rename variable
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java8
1 files changed, 4 insertions, 4 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 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));
}
}