Skip to content

Ensure substitution map has been initialized before testing #6394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Feb 28, 2025
Merged

Ensure substitution map has been initialized before testing #6394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/org/labkey/filters/ContentSecurityPolicyFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down