Workaround: look up ApprovedWhitelist via a supertype

jenkinsci · Jan 3, 2024 · 343ce96 · 343ce96
1 parent bcb45b5
commit 343ce96
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval.java b/src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval.java
@@ -971,7 +971,8 @@ public synchronized String[] getApprovedScriptHashes() {
     @Extension public static final class ApprovedWhitelist extends ProxyWhitelist {
 
         static void configurationChanged() {
-            ExtensionList.lookupSingleton(ApprovedWhitelist.class).initialized.set(false);
+            // Do not use lookupSingleton: ScriptApprovalLoadingTest.dynamicLoading
+            ExtensionList.lookup(Whitelist.class).get(ApprovedWhitelist.class).initialized.set(false);
         }
 
         private final AtomicBoolean initialized = new AtomicBoolean();