diff --git a/core/src/main/java/hudson/PluginFirstClassLoader.java b/core/src/main/java/hudson/PluginFirstClassLoader.java index ec7e0732dc..fda97b672d 100644 --- a/core/src/main/java/hudson/PluginFirstClassLoader.java +++ b/core/src/main/java/hudson/PluginFirstClassLoader.java @@ -27,10 +27,10 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import jenkins.util.AntClassLoader; @@ -43,12 +43,15 @@ import jenkins.util.AntClassLoader; public class PluginFirstClassLoader extends AntClassLoader { + static { + registerAsParallelCapable(); + } public PluginFirstClassLoader() { super(null, false); } - private List urls = new ArrayList<>(); + private List urls = new CopyOnWriteArrayList<>(); @Override public void addPathFiles( Collection paths ) diff --git a/core/src/main/java/hudson/util/MaskingClassLoader.java b/core/src/main/java/hudson/util/MaskingClassLoader.java index e143a47784..e8bf134217 100644 --- a/core/src/main/java/hudson/util/MaskingClassLoader.java +++ b/core/src/main/java/hudson/util/MaskingClassLoader.java @@ -49,6 +49,10 @@ public class MaskingClassLoader extends ClassLoader { private final List masksResources = new CopyOnWriteArrayList<>(); + static { + registerAsParallelCapable(); + } + public MaskingClassLoader(ClassLoader parent, String... masks) { this(parent, Arrays.asList(masks)); } diff --git a/core/src/main/java/jenkins/util/AntClassLoader.java b/core/src/main/java/jenkins/util/AntClassLoader.java index 9bccc8fd11..5f144f1e87 100644 --- a/core/src/main/java/jenkins/util/AntClassLoader.java +++ b/core/src/main/java/jenkins/util/AntClassLoader.java @@ -93,6 +93,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo private static final Object MR_JARFILE_CTOR_RUNTIME_VERSION_VAL; static { + registerAsParallelCapable(); if (IS_ATLEAST_JAVA9) { Class[] ctorArgs = null; Object runtimeVersionVal = null;