From 67560c52b9ffe6739d89fd11f5fe09a1f4b11ec1 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Tue, 28 Oct 2025 09:39:28 -0700 Subject: [PATCH] Troubleshoot race condition with encryption migration --- api/src/org/labkey/api/security/Encryption.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/src/org/labkey/api/security/Encryption.java b/api/src/org/labkey/api/security/Encryption.java index 7499d0a7465..484db473869 100644 --- a/api/src/org/labkey/api/security/Encryption.java +++ b/api/src/org/labkey/api/security/Encryption.java @@ -572,6 +572,10 @@ else if (!cipher.equals(AESConfig.current.getCipherName())) if (migrationNeeded) { + // Reset to zero to ignore problems that might have been encountered early in startup, prior to + // starting the migration process + DECRYPTION_EXCEPTIONS.set(0); + final AESConfig migrationConfig = oldConfig; final String message = keySource; final String passPhrase = oldPassPhrase != null ? oldPassPhrase : getEncryptionPassPhrase();