GUACAMOLE-1656: Merge fix for possible NPE if user KSM config is unset.

This commit is contained in:
Mike Jumper
2022-09-28 21:17:59 -07:00
committed by GitHub

View File

@@ -163,7 +163,7 @@ public class KsmSecretService implements VaultSecretService {
// If the user config happens to be the same as admin-defined one,
// don't bother trying again
if (!Objects.equal(userKsmConfig, ksmConfig))
if (userKsmConfig != null && !Objects.equal(userKsmConfig, ksmConfig))
return getClient(userKsmConfig).getSecret(name);
return CompletableFuture.completedFuture(null);