diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-02-01 02:52:41 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-02-01 02:52:41 +0000 |
commit | 5c1e235f15aa496d889807c682755547e27ca27d (patch) | |
tree | 3b41e613c227852c310d3a11148d2a14ad973784 /EssentialsGroupManager/src/org | |
parent | 27697c7b0ca96245a29b439e7539f0ff81a6805d (diff) | |
download | Essentials-5c1e235f15aa496d889807c682755547e27ca27d.tar Essentials-5c1e235f15aa496d889807c682755547e27ca27d.tar.gz Essentials-5c1e235f15aa496d889807c682755547e27ca27d.tar.lz Essentials-5c1e235f15aa496d889807c682755547e27ca27d.tar.xz Essentials-5c1e235f15aa496d889807c682755547e27ca27d.zip |
[GM] Catch all of the null.
Diffstat (limited to 'EssentialsGroupManager/src/org')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java index 04efd384e..095b99a50 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java @@ -823,24 +823,28 @@ public class WorldDataHolder { * nothing. */ } else { - if (nodeData instanceof List) { - for (Object o : ((List) nodeData)) { - /* - * Only add this permission if it's not empty - */ - if (!o.toString().isEmpty()) - thisUser.addPermission(o.toString()); - } - } else if (nodeData instanceof String) { - try { + try { + if (nodeData instanceof List) { + for (Object o : ((List) nodeData)) { + /* + * Only add this permission if it's not empty + */ + if (!o.toString().isEmpty()) { + thisUser.addPermission(o.toString()); + } + } + } else if (nodeData instanceof String) { + /* * Only add this permission if it's not empty */ - if (!nodeData.toString().isEmpty()) + if (!nodeData.toString().isEmpty()) { thisUser.addPermission(nodeData.toString()); - } catch (NullPointerException e) { - // Ignore this entry as it's null. + } + } + } catch (NullPointerException e) { + // Ignore this entry as it's null. } thisUser.sortPermissions(); } |