Ensure substitution map has been initialized before testing

LabKey · Feb 28, 2025 · 0742bef · 0742bef
1 parent a6280c5
commit 0742bef
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/api/src/org/labkey/filters/ContentSecurityPolicyFilter.java b/api/src/org/labkey/filters/ContentSecurityPolicyFilter.java
@@ -372,6 +372,8 @@ public void testSubstitutionMap()
         {
             synchronized (ALLOWED_SOURCES_LOCK)
             {
+                // Ensure substitution map has been initialized, otherwise the finally block asserts will fail
+                regenerateSubstitutionMap();
                 // Make a deep copy of ALLOWED_SOURCES so we can restore it after testing
                 int sourceMapSize = ALLOWED_SOURCES.size();
                 int substitutionMapSize = ALLOWED_SOURCES_SUBSTITUTION_MAP.size();