diff options
| author | snowleo <schneeleo@gmail.com> | 2012-08-07 20:13:27 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-08-07 20:13:27 +0200 |
| commit | 738b895cba194bb5699769016f78bd0181dd108c (patch) | |
| tree | e6f90ba8c93e7188e7fa047f80f63f82b6c5bce4 | |
| parent | 54133cd75e53d67e431a36669f164eabd3b80c81 (diff) | |
| parent | 72aeec58ed5f2bc2f4892ec6586e6791e3f19897 (diff) | |
| download | Essentials-738b895cba194bb5699769016f78bd0181dd108c.tar Essentials-738b895cba194bb5699769016f78bd0181dd108c.tar.gz Essentials-738b895cba194bb5699769016f78bd0181dd108c.tar.lz Essentials-738b895cba194bb5699769016f78bd0181dd108c.tar.xz Essentials-738b895cba194bb5699769016f78bd0181dd108c.zip | |
Merge branch 'refs/heads/groupmanager' into 2.9
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java index cc8181ddf..d0f5fed8b 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GlobalGroups.java @@ -161,7 +161,11 @@ public class GlobalGroups { Object element;
// 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 instanceof List) {
@@ -180,7 +184,11 @@ public class GlobalGroups { throw new IllegalArgumentException("Unknown type of permission node for global group: " + groupName);
// 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 instanceof MemorySection) {
|