Merge branch 'master' into revert-10388-revert-10370-revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14

1 files changed, 3 insertions, 5 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
index eaa4916d8fc..78d39ef996b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TlsSecretsKeys.java
@@ -59,17 +59,15 @@ public class TlsSecretsKeys {
     }
 
     private Optional<TlsSecrets> readFromSecretStore(Optional<String> secretKeyname) {
-        if(secretKeyname.isEmpty()) return Optional.empty();
-        TlsSecrets tlsSecretParameters = TlsSecrets.MISSING;
+        if (secretKeyname.isEmpty()) return Optional.empty();
         try {
             String cert = secretStore.getSecret(secretKeyname.get() + "-cert");
             String key = secretStore.getSecret(secretKeyname.get() + "-key");
-            tlsSecretParameters = new TlsSecrets(cert, key);
+            return Optional.of(new TlsSecrets(cert, key));
         } catch (RuntimeException e) {
             // Assume not ready yet
-//            log.log(LogLevel.DEBUG, "Could not fetch certificate/key with prefix: " + secretKeyname.get(), e);
+            return Optional.of(TlsSecrets.MISSING);
         }
-        return Optional.of(tlsSecretParameters);
     }
 
     /** Returns a transaction which deletes these tls secrets key if they exist */