From cd7bf5eff2a1daeb9ad792820265c70ff8b3e0dc Mon Sep 17 00:00:00 2001 From: ElgarL Date: Wed, 18 Apr 2012 22:22:35 +0100 Subject: Prevent null perms getting past the GlobalGroups loader. --- .../src/org/anjocaido/groupmanager/GlobalGroups.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java') diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java index 647d729e5..04d9e86be 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java @@ -159,12 +159,14 @@ public class GlobalGroups { if (element instanceof List) { try { for (String node : (List) element) { - newGroup.addPermission(node); + if ((node != null) && !node.isEmpty()) + newGroup.addPermission(node); } } catch (ClassCastException ex) { throw new IllegalArgumentException("Invalid permission node for global group: " + groupName, ex); } } else if (element instanceof String) { + if ((element != null) && !((String)element).isEmpty()) newGroup.addPermission((String) element); } else throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName); -- cgit v1.2.3