1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-08 07:36:42 +02:00

Merge branch 'refs/heads/groupmanager' into 2.9

This commit is contained in:
snowleo
2012-08-07 20:13:27 +02:00

View File

@@ -161,7 +161,11 @@ public class GlobalGroups {
Object element; Object element;
// Permission nodes // Permission nodes
element = ((Map<String, Object>)allGroups.get(groupName)).get("permissions"); try {
element = ((Map<String, Object>)allGroups.get(groupName)).get("permissions");
} catch ( Exception ex) {
throw new IllegalArgumentException("The GlobalGroup ' " + groupName + "' is formatted incorrectly: ", ex);
}
if (element != null) if (element != null)
if (element instanceof List) { if (element instanceof List) {
@@ -180,7 +184,11 @@ public class GlobalGroups {
throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName); throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName);
// Info nodes // Info nodes
element = ((Map<String, Object>)allGroups.get(groupName)).get("info"); try {
element = ((Map<String, Object>)allGroups.get(groupName)).get("info");
} catch ( Exception ex) {
throw new IllegalArgumentException("The GlobalGroup ' " + groupName + "' is formatted incorrectly: ", ex);
}
if (element != null) if (element != null)
if (element instanceof MemorySection) { if (element instanceof MemorySection) {