Handle non-vespa-mtls scenario during setup of providers

1 files changed, 3 insertions, 2 deletions

diff --git a/zookeeper-server/zookeeper-server-3.8.1/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java b/zookeeper-server/zookeeper-server-3.8.1/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java
index 8bb88a83b10..68f7459530e 100644
--- a/zookeeper-server/zookeeper-server-3.8.1/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java
+++ b/zookeeper-server/zookeeper-server-3.8.1/src/main/java/com/yahoo/vespa/zookeeper/VespaMtlsAuthenticationProvider.java
@@ -1,6 +1,7 @@
 // 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 org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.data.Id;
 import org.apache.zookeeper.server.ServerCnxn;
@@ -26,11 +27,11 @@ public class VespaMtlsAuthenticationProvider extends X509AuthenticationProvider
     }
 
     private static X509KeyManager keyManager() {
-        return new VespaSslContextProvider().tlsContext().keyManager();
+        return new VespaSslContextProvider().tlsContext().map(X509SslContext::keyManager).orElse(null);
     }
 
     private static X509TrustManager trustManager() {
-        return new VespaSslContextProvider().tlsContext().trustManager();
+        return new VespaSslContextProvider().tlsContext().map(X509SslContext::trustManager).orElse(null);
     }
 
     @Override