diff options
Diffstat (limited to 'zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java')
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java index 71cc81a0db0..eca5df73dfb 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java @@ -1,11 +1,9 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; -import com.yahoo.security.X509SslContext; -import com.yahoo.security.tls.TlsContext; +import com.yahoo.vespa.zookeeper.tls.VespaZookeeperTlsContextUtils; import javax.net.ssl.SSLContext; -import java.util.Optional; import java.util.function.Supplier; /** @@ -15,22 +13,11 @@ import java.util.function.Supplier; */ public class VespaSslContextProvider implements Supplier<SSLContext> { - private static TlsContext tlsContext; - @Override public SSLContext get() { - return tlsContext().orElseThrow(() -> new IllegalStateException("Vespa TLS is not enabled")).context(); - } - - public Optional<X509SslContext> tlsContext() { - synchronized (VespaSslContextProvider.class) { - return Optional.ofNullable(tlsContext.sslContext()); - } - } - - static synchronized void set(TlsContext ctx) { - if (tlsContext != null) tlsContext.close(); - tlsContext = ctx; + return VespaZookeeperTlsContextUtils.tlsContext() + .orElseThrow(() -> new IllegalStateException("Vespa TLS is not enabled")) + .sslContext().context(); } } |