diff options
author | jonmv <venstad@gmail.com> | 2023-11-24 09:20:26 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-11-24 09:20:26 +0100 |
commit | 485d4235f75dad465fedf6dec546407ba5780faf (patch) | |
tree | b0345ff43be89c67908ff0baa165e99b80c67640 /zookeeper-server/zookeeper-server-common/src | |
parent | ed825288c63e8e6e30d19c0e939c2e5cd66db144 (diff) |
Handle non-vespa-mtls scenario during setup of providers
Diffstat (limited to 'zookeeper-server/zookeeper-server-common/src')
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java | 8 |
1 files changed, 4 insertions, 4 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 b50cbdbdbdf..71cc81a0db0 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 @@ -5,6 +5,7 @@ import com.yahoo.security.X509SslContext; import com.yahoo.security.tls.TlsContext; import javax.net.ssl.SSLContext; +import java.util.Optional; import java.util.function.Supplier; /** @@ -18,13 +19,12 @@ public class VespaSslContextProvider implements Supplier<SSLContext> { @Override public SSLContext get() { - return tlsContext().context(); + return tlsContext().orElseThrow(() -> new IllegalStateException("Vespa TLS is not enabled")).context(); } - public X509SslContext tlsContext() { + public Optional<X509SslContext> tlsContext() { synchronized (VespaSslContextProvider.class) { - if (tlsContext == null) throw new IllegalStateException("Vespa TLS is not enabled"); - return tlsContext.sslContext(); + return Optional.ofNullable(tlsContext.sslContext()); } } |