Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-06-30 08:44:55 +02:00
Code Issues Projects Releases Wiki Activity

Few fixes to AddonClassLoader

Browse Source 
Related to #280

Added handling for NoClassDefFoundError
"Grammatically" fixed a few exception messages
This commit is contained in:
Florian CUNY 2018-09-29 15:01:45 +02:00
parent 2df049f70d
commit f110aedc69
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java
View File

@ -46,17 +46,17 @@ public class AddonClassLoader extends URLClassLoader {
String mainClass = data.getString("main"); String mainClass = data.getString("main");
javaClass = Class.forName(mainClass, true, this); javaClass = Class.forName(mainClass, true, this);
if(mainClass.startsWith("world.bentobox.bentobox")){ if(mainClass.startsWith("world.bentobox.bentobox")){
throw new InvalidAddonFormatException("Packages declaration cannot start with 'world.bentobox.bentobox'"); throw new InvalidAddonFormatException("Package declaration cannot start with 'world.bentobox.bentobox'");
} }
} catch (Exception e) { } catch (Exception e) {
throw new InvalidDescriptionException("Could not load '" + path.getName() + "' in folder '" + path.getParent() + "' - " + e.getMessage()); throw new InvalidDescriptionException("Could not load '" + path.getName() + "' in folder '" + path.getParent() + "' - " + e.getMessage());
} }
Class<? extends Addon> addonClass; Class<? extends Addon> addonClass;
try{ try {
addonClass = javaClass.asSubclass(Addon.class); addonClass = javaClass.asSubclass(Addon.class);
} catch(ClassCastException e){ } catch (ClassCastException e) {
throw new InvalidAddonInheritException("Main class doesn't not extends super class 'Addon'"); throw new InvalidAddonInheritException("Main class does not extend 'Addon'");
} }
addon = addonClass.getDeclaredConstructor().newInstance(); addon = addonClass.getDeclaredConstructor().newInstance();
@ -123,7 +123,7 @@ public class AddonClassLoader extends URLClassLoader {
if (result == null) { if (result == null) {
try { try {
result = super.findClass(name); result = super.findClass(name);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException | NoClassDefFoundError e) {
result = null; result = null;
} }
if (result != null) { if (result != null) {