diff options
| author | snowleo <schneeleo@gmail.com> | 2012-04-26 10:42:48 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-04-26 10:42:48 +0200 |
| commit | 3a60191a9dce4e7551661ed91c2a2836f6b95327 (patch) | |
| tree | 58bd089323db8a4e8875e35145f47bedc6e1ba8a /EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java | |
| parent | 95e6db679775d7ecb95ece8192b350f4c87169cb (diff) | |
| parent | 06247732da564876d97de99aa706fd7e823c0df9 (diff) | |
| download | Essentials-3a60191a9dce4e7551661ed91c2a2836f6b95327.tar Essentials-3a60191a9dce4e7551661ed91c2a2836f6b95327.tar.gz Essentials-3a60191a9dce4e7551661ed91c2a2836f6b95327.tar.lz Essentials-3a60191a9dce4e7551661ed91c2a2836f6b95327.tar.xz Essentials-3a60191a9dce4e7551661ed91c2a2836f6b95327.zip | |
Merge branch 'refs/heads/groupmanager'
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);
|