diff options
| author | ElgarL <ElgarL@palmergames.com> | 2012-04-18 22:22:35 +0100 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2012-04-18 22:22:35 +0100 |
| commit | df7db445b82dc0fa202e063cc37812cf4a67c53f (patch) | |
| tree | 259af0f8b010c1ee8598a5825540e08f23c45035 /EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java | |
| parent | 59f6ca0239227ec53be794666ab62cf11bb40a2e (diff) | |
| download | Essentials-df7db445b82dc0fa202e063cc37812cf4a67c53f.tar Essentials-df7db445b82dc0fa202e063cc37812cf4a67c53f.tar.gz Essentials-df7db445b82dc0fa202e063cc37812cf4a67c53f.tar.lz Essentials-df7db445b82dc0fa202e063cc37812cf4a67c53f.tar.xz Essentials-df7db445b82dc0fa202e063cc37812cf4a67c53f.zip | |
Prevent null perms getting past the GlobalGroups loader.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java | 4 |
1 files changed, 3 insertions, 1 deletions
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<String>) 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);
|