diff options
| -rw-r--r-- | zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java index 8236fdedc71..6ae7fe26cd7 100644 --- a/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java +++ b/zookeeper-client-common/src/main/java/com/yahoo/vespa/zookeeper/client/ZkClientConfigBuilder.java @@ -39,7 +39,7 @@ public class ZkClientConfigBuilder { this(defaultTlsContext); } - public ZkClientConfigBuilder(TlsContext tlsContext) { + ZkClientConfigBuilder(TlsContext tlsContext) { this.tlsContext = tlsContext; } @@ -82,10 +82,6 @@ public class ZkClientConfigBuilder { } private static Optional<TlsContext> getTlsContext() { - // TODO(bjorncs) Remove handling of temporary feature flag - boolean temporaryFeatureFlag = Optional.ofNullable(System.getenv("VESPA_USE_TLS_FOR_ZOOKEEPER_CLIENT")).map(Boolean::parseBoolean).orElse(false); - if (!temporaryFeatureFlag) return Optional.empty(); - if (TransportSecurityUtils.getInsecureMixedMode() == MixedMode.PLAINTEXT_CLIENT_MIXED_SERVER) return Optional.empty(); return TransportSecurityUtils.getSystemTlsContext(); } |