summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java6
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java2
2 files changed, 3 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
index 30754b7bc04..f07327517f8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
@@ -2,11 +2,11 @@
package com.yahoo.vespa.config.server.zookeeper;
import com.google.inject.Inject;
+import com.yahoo.cloud.config.ZookeeperServerConfig;
import com.yahoo.io.IOUtils;
import com.yahoo.log.LogLevel;
import com.yahoo.text.Utf8;
import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.zookeeper.ZooKeeperServer;
import java.io.File;
import java.io.FilenameFilter;
@@ -63,8 +63,8 @@ public class ConfigCurator {
}
@Inject
- public ConfigCurator(Curator curator, ZooKeeperServer server) {
- this(curator, server.getZookeeperServerConfig().juteMaxBuffer());
+ public ConfigCurator(Curator curator, ZookeeperServerConfig config) {
+ this(curator, config.juteMaxBuffer());
}
private ConfigCurator(Curator curator, int maxNodeSize) {
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
index 5615e1133b8..252dc6697b0 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
@@ -125,8 +125,6 @@ public class ZooKeeperServer extends AbstractComponent implements Runnable {
super.deconstruct();
}
- public ZookeeperServerConfig getZookeeperServerConfig() { return zookeeperServerConfig; }
-
private static Set<String> zookeeperServerHostnames(ZookeeperServerConfig zookeeperServerConfig) {
return zookeeperServerConfig.server().stream().map(ZookeeperServerConfig.Server::hostname).collect(Collectors.toSet());
}