Fixed silly NPE during shutdown when java becomes a meanie-pants and steals our lunch money :(

This commit is contained in:
Nathan Adams 2011-12-09 17:13:47 +00:00
parent 3ae2ce4c30
commit a7beacd2ff

View File

@ -242,9 +242,14 @@ public class JavaPluginLoader implements PluginLoader {
public void removeClass(String name) { public void removeClass(String name) {
Class<?> clazz = classes.remove(name); Class<?> clazz = classes.remove(name);
if ((clazz != null) && (ConfigurationSerializable.class.isAssignableFrom(clazz))) { try {
Class<? extends ConfigurationSerializable> serializable = (Class<? extends ConfigurationSerializable>)clazz; if ((clazz != null) && (ConfigurationSerializable.class.isAssignableFrom(clazz))) {
ConfigurationSerialization.unregisterClass(serializable); Class<? extends ConfigurationSerializable> serializable = (Class<? extends ConfigurationSerializable>)clazz;
ConfigurationSerialization.unregisterClass(serializable);
}
} catch (NullPointerException ex) {
// Boggle!
// (Native methods throwing NPEs is not fun when you can't stop it before-hand)
} }
} }