Nonfunctional changes

4 files changed, 5 insertions, 6 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadHandler.java
index b493e2c7bc6..93af4b1d593 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ReloadHandler.java
@@ -9,8 +9,7 @@ import java.util.Set;
 /**
  * Interface representing a reload handler.
  *
- * @author lulf
- * @since 5.1.24
+ * @author Ulf Lilleengen
  */
 public interface ReloadHandler {
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
index 68704eeb66a..f9f84de1cfb 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java
@@ -360,8 +360,8 @@ public class ZooKeeperClient {
         }
     }
 
-    public void write(AllocatedHosts info) throws IOException {
-        configCurator.putData(rootPath.append(ZKApplicationPackage.allocatedHostsNode).getAbsolute(), info.toJson());
+    public void write(AllocatedHosts hosts) throws IOException {
+        configCurator.putData(rootPath.append(ZKApplicationPackage.allocatedHostsNode).getAbsolute(), hosts.toJson());
     }
 
     public void write(Map<Version, FileRegistry> fileRegistryMap) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
index 9374d68a6ac..bc7c428833b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
@@ -62,7 +62,7 @@ public class RemoteSession extends Session {
 
         return ApplicationSet.fromList(applicationLoader.buildModels(zooKeeperClient.readApplicationId(),
                                                                      zooKeeperClient.readVespaVersion(),
-                                                                     zooKeeperClient.loadApplicationPackage(),
+                                                                     applicationPackage,
                                                                      new SettableOptional<>(allocatedHosts),
                                                                      clock.instant()));
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
index 8d7023fef5b..f30a58cffea 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
@@ -123,7 +123,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
 
     private void setLiveApp(ApplicationSet applicationSet) {
         ApplicationId id = applicationSet.getId();
-        final Collection<String> hostsForApp = applicationSet.getAllHosts();
+        Collection<String> hostsForApp = applicationSet.getAllHosts();
         hostRegistry.update(id, hostsForApp);
         applicationSet.updateHostMetrics();
         tenantMetricUpdater.setApplications(applicationMapper.numApplications());