live app -> active app

3 files changed, 8 insertions, 9 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 57bf88d8aad..ff1a4cf5f4a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -236,7 +236,7 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica
             if (applicationSet.getApplicationGeneration() != activeSessionId)
                 return; // Application activated a new session before we got here.
 
-            setLiveApp(applicationSet);
+            setActiveApp(applicationSet);
             notifyReloadListeners(applicationSet);
         }
     }
@@ -281,7 +281,7 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica
         reloadListener.applicationRemoved(applicationId);
     }
 
-    private void setLiveApp(ApplicationSet applicationSet) {
+    private void setActiveApp(ApplicationSet applicationSet) {
         ApplicationId id = applicationSet.getId();
         Collection<String> hostsForApp = applicationSet.getAllHosts();
         hostRegistry.update(id, hostsForApp);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplication.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplication.java
index 107bd8be367..4c262379c35 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplication.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplication.java
@@ -84,7 +84,7 @@ public class ZKApplication {
     }
 
     /**
-     * Retrieves a node relative to the node of the live application
+     * Retrieves a node relative to the node of the active application
      *
      * @param path a path relative to the currently active application
      * @return a Reader that can be used to get the data
@@ -129,7 +129,7 @@ public class ZKApplication {
     }
 
     /**
-     * Checks if the given node exists under path under this live app
+     * Checks if the given node exists under path under this active app
      *
      * @param path a zookeeper path
      * @return true if the node exists in the path, false otherwise
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
index 0fa6e9a0704..9b23037ed19 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
@@ -5,7 +5,6 @@ import com.google.common.base.Joiner;
 import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationMetaData;
-import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.ComponentInfo;
 import com.yahoo.config.application.api.FileRegistry;
 import com.yahoo.config.application.api.UnparsedConfigDefinition;
@@ -59,7 +58,7 @@ public class ZKApplicationPackage extends AbstractApplicationPackage {
     public ZKApplicationPackage(AddFileInterface fileManager, Curator curator, Path sessionPath, int maxNodeSize) {
         verifyAppPath(curator, sessionPath);
         zkApplication = new ZKApplication(curator, sessionPath, maxNodeSize);
-        metaData = readMetaDataFromLiveApp(zkApplication);
+        metaData = readMetaDataFromActiveApp(zkApplication);
         importFileRegistries(fileManager);
         allocatedHosts = importAllocatedHosts();
     }
@@ -102,13 +101,13 @@ public class ZKApplicationPackage extends AbstractApplicationPackage {
         }
     }
 
-    private ApplicationMetaData readMetaDataFromLiveApp(ZKApplication liveApp) {
+    private ApplicationMetaData readMetaDataFromActiveApp(ZKApplication activeApp) {
         Path metaPath = Path.fromString(ZKApplication.META_ZK_PATH);
-        String metaDataString = liveApp.getData(metaPath);
+        String metaDataString = activeApp.getData(metaPath);
         if (metaDataString == null || metaDataString.isEmpty()) {
             return null;
         }
-        return ApplicationMetaData.fromJsonString(liveApp.getData(metaPath));
+        return ApplicationMetaData.fromJsonString(activeApp.getData(metaPath));
     }
 
     @Override