diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-03-08 18:20:34 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-03-08 18:22:52 +0000 |
commit | d733a32f7c2c48b872f9674bf12129b5b14079eb (patch) | |
tree | dd9e46733762f46520b5cce644eeff9c63f3ede9 /src/main/java | |
parent | 0b35cd8127e30c50889cb91b6cb945b42e12afa5 (diff) | |
download | bukkit-d733a32f7c2c48b872f9674bf12129b5b14079eb.tar bukkit-d733a32f7c2c48b872f9674bf12129b5b14079eb.tar.gz bukkit-d733a32f7c2c48b872f9674bf12129b5b14079eb.tar.lz bukkit-d733a32f7c2c48b872f9674bf12129b5b14079eb.tar.xz bukkit-d733a32f7c2c48b872f9674bf12129b5b14079eb.zip |
Reverted classloader changes by 1f0d89be27, now actually works! Again!
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/bukkit/plugin/java/PluginClassLoader.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java index bc6cb0a2..d17e0f4f 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -24,25 +24,17 @@ public class PluginClassLoader extends URLClassLoader { Class<?> result = classes.get(name); if (result == null) { - ClassNotFoundException ex = null; + result = loader.getClassByName(name); - try { + if (result == null) { result = super.findClass(name); - } catch (ClassNotFoundException e) { - ex = e; - } - if (result != null) { - loader.setClass(name, result); - } else { - result = loader.getClassByName(name); + if (result != null) { + loader.setClass(name, result); + } } - if (result != null ) { - classes.put(name, result); - } else { - throw ex; - } + classes.put(name, result); } return result; |