summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-06-14 18:20:49 +0100
committerKHobbits <rob@khobbits.co.uk>2014-06-14 18:20:49 +0100
commit2540bab6b1bea38cc5dd88dfd213ad96505d0172 (patch)
tree6e90e252b1c3f6ad9d1a7ecf91cfb352a6388137
parent580fa15d4ea1a93693116592766bfa7b66df9830 (diff)
downloadEssentials-2540bab6b1bea38cc5dd88dfd213ad96505d0172.tar
Essentials-2540bab6b1bea38cc5dd88dfd213ad96505d0172.tar.gz
Essentials-2540bab6b1bea38cc5dd88dfd213ad96505d0172.tar.lz
Essentials-2540bab6b1bea38cc5dd88dfd213ad96505d0172.tar.xz
Essentials-2540bab6b1bea38cc5dd88dfd213ad96505d0172.zip
Check for arraynull on pex group request.
-rw-r--r--Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java18
1 files changed, 16 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java b/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
index 68dc3fe50..cb6d849aa 100644
--- a/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
@@ -25,7 +25,14 @@ public class PermissionsExHandler extends SuperpermsHandler
{
return null;
}
- return user.getGroupsNames()[0];
+
+ String[] groupsNames = user.getGroupsNames();
+ if (groupsNames == null)
+ {
+ return null;
+ }
+
+ return groupsNames[0];
}
@Override
@@ -36,7 +43,14 @@ public class PermissionsExHandler extends SuperpermsHandler
{
return null;
}
- return Arrays.asList(user.getGroupsNames());
+
+ String[] groupsNames = user.getGroupsNames();
+ if (groupsNames == null)
+ {
+ return null;
+ }
+
+ return Arrays.asList(groupsNames);
}
@Override