Spigot / Bukkit / c29791a82d9

Commits

md_5 authored c29791a82d9 28 Dec 2017

Backport some PluginClassLoader changes for soak testing.

src/main/java/org/bukkit/plugin/java/PluginClassLoader.java

Modified

-1
+package org.bukkit.plugin.java;
-2
-+
+import com.google.common.io.ByteStreams;
-4
+import java.io.File;
-+
+import java.io.IOException;
-+
+import java.io.InputStream;
-7
+import java.net.MalformedURLException;
-8
+import java.net.URL;
-9
+import java.net.URLClassLoader;
-+
+import java.security.CodeSigner;
-+
+import java.security.CodeSource;
-12
+import java.util.HashMap;
-13
+import java.util.Map;
-14
+import java.util.Set;
-+
+import java.util.jar.JarEntry;
-+
+import java.util.jar.JarFile;
-+
+import java.util.jar.Manifest;
-18
-19
+import org.apache.commons.lang.Validate;
-20
+import org.bukkit.plugin.InvalidPluginException;
-21
+import org.bukkit.plugin.PluginDescriptionFile;
-22
-23
+/**
-24
+ * A ClassLoader for plugins, to allow shared classes across multiple plugins
-25
+ */
-26
+final class PluginClassLoader extends URLClassLoader {
-27
+    private final JavaPluginLoader loader;
-28
+    private final Map<String, Class<?>> classes = new HashMap<String, Class<?>>();
-29
+    private final PluginDescriptionFile description;
-30
+    private final File dataFolder;
-31
+    private final File file;
-+
+    private final JarFile jar;
-+
+    private final Manifest manifest;
-+
+    private final URL url;
-35
+    final JavaPlugin plugin;
-36
+    private JavaPlugin pluginInit;
-37
+    private IllegalStateException pluginState;
-38
--
+    PluginClassLoader(final JavaPluginLoader loader, final ClassLoader parent, final PluginDescriptionFile description, final File dataFolder, final File file) throws InvalidPluginException, MalformedURLException {
-+
+    PluginClassLoader(final JavaPluginLoader loader, final ClassLoader parent, final PluginDescriptionFile description, final File dataFolder, final File file) throws IOException, InvalidPluginException, MalformedURLException {
-40
+        super(new URL[] {file.toURI().toURL()}, parent);
-41
+        Validate.notNull(loader, "Loader cannot be null");
-42
-43
+        this.loader = loader;
-44
+        this.description = description;
-45
+        this.dataFolder = dataFolder;
-46
+        this.file = file;
-+
+        this.jar = new JarFile(file, true);
-+
+        this.manifest = jar.getManifest();
-+
+        this.url = file.toURI().toURL();
-50
-51
+        try {
-52
+            Class<?> jarClass;
-53
+            try {
-54
+                jarClass = Class.forName(description.getMain(), true, this);
-55
+            } catch (ClassNotFoundException ex) {
-56
+                throw new InvalidPluginException("Cannot find main class `" + description.getMain() + "'", ex);
-57
+            }
-58
-59
+            Class<? extends JavaPlugin> pluginClass;
-81
+            throw new ClassNotFoundException(name);
-82
+        }
-83
+        Class<?> result = classes.get(name);
-84
-85
+        if (result == null) {
-86
+            if (checkGlobal) {
-87
+                result = loader.getClassByName(name);
-88
+            }
-89
-90
+            if (result == null) {
--
+                result = super.findClass(name);
-+
+                String path = name.replace('.', '/').concat(".class");
-+
+                JarEntry entry = jar.getJarEntry(path);
-+
-+
+                if (entry != null) {
-+
+                    byte[] classBytes;
-+
-+
+                    try (InputStream is = jar.getInputStream(entry)) {
-+
+                        classBytes = ByteStreams.toByteArray(is);
-+
+                    } catch (IOException ex) {
-+
+                        throw new ClassNotFoundException(name, ex);
-+
+                    }
-+
-+
+                    int dot = name.lastIndexOf('.');
-+
+                    if (dot != -1) {
-+
+                        String pkgName = name.substring(0, dot);
-+
+                        if (getPackage(pkgName) == null) {
-+
+                            definePackage(pkgName, manifest, url);
-+
+                        }
-+
+                    }
-+
-+
+                    CodeSigner[] signers = entry.getCodeSigners();
-+
+                    CodeSource source = new CodeSource(url, signers);
-+
-+
+                    result = defineClass(name, classBytes, 0, classBytes.length, source);
-+
+                }
-+
-+
+                if (result == null) {
-+
+                    result = super.findClass(name);
-+
+                }
-120
-121
+                if (result != null) {
-122
+                    loader.setClass(name, result);
-123
+                }
-124
+            }
-125
-126
+            classes.put(name, result);
-127
+        }
-128
-129
+        return result;
-130
+    }
-131
-+
+    @Override
-+
+    public void close() throws IOException {
-+
+        try {
-+
+            super.close();
-+
+        } finally {
-+
+            jar.close();
-+
+        }
-+
+    }
-+
-141
+    Set<String> getClasses() {
-142
+        return classes.keySet();
-143
+    }
-144
-145
+    synchronized void initialize(JavaPlugin javaPlugin) {
-146
+        Validate.notNull(javaPlugin, "Initializing plugin cannot be null");
-147
+        Validate.isTrue(javaPlugin.getClass().getClassLoader() == this, "Cannot initialize plugin outside of this class loader");
-148
+        if (this.plugin != null || this.pluginInit != null) {
-149
+            throw new IllegalArgumentException("Plugin already initialized!", pluginState);
-150
+        }

Bukkit

Commits

Jira Issues

Add shortcut