Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-04-03 10:35:48 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-2629: Better thread safety for plugin class loading

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot 2016-08-26 15:37:26 +10:00
parent 497a87b5b5
commit 4be07ca07a
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
View File

@ -7,6 +7,7 @@ import java.io.InputStream;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -48,7 +49,7 @@ public final class JavaPluginLoader implements PluginLoader {
final Server server; final Server server;
private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), }; private final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), };
private final Map<String, Class<?>> classes = new HashMap<String, Class<?>>(); private final Map<String, Class<?>> classes = new HashMap<String, Class<?>>();
private final Map<String, PluginClassLoader> loaders = new LinkedHashMap<String, PluginClassLoader>(); private final Map<String, PluginClassLoader> loaders = Collections.synchronizedMap(new LinkedHashMap<String, PluginClassLoader>());
/** /**
* This class was not meant to be constructed explicitly * This class was not meant to be constructed explicitly
@ -114,9 +115,6 @@ public final class JavaPluginLoader implements PluginLoader {
} }
for (final String pluginName : description.getDepend()) { for (final String pluginName : description.getDepend()) {
if (loaders == null) {
throw new UnknownDependencyException(pluginName);
}
PluginClassLoader current = loaders.get(pluginName); PluginClassLoader current = loaders.get(pluginName);
if (current == null) { if (current == null) {
@ -186,14 +184,14 @@ public final class JavaPluginLoader implements PluginLoader {
if (cachedClass != null) { if (cachedClass != null) {
return cachedClass; return cachedClass;
} else { } else {
for (String current : loaders.keySet()) { synchronized (loaders) {
PluginClassLoader loader = loaders.get(current); for (PluginClassLoader loader : loaders.values()) {
try {
try { cachedClass = loader.findClass(name, false);
cachedClass = loader.findClass(name, false); } catch (ClassNotFoundException cnfe) {}
} catch (ClassNotFoundException cnfe) {} if (cachedClass != null) {
if (cachedClass != null) { return cachedClass;
return cachedClass; }
} }
} }
} }