summaryrefslogtreecommitdiffstats
path: root/src/com/gitblit/client/EditUserDialog.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2012-10-22 16:16:57 -0400
committerJames Moger <james.moger@gitblit.com>2012-10-22 16:16:57 -0400
commitba54242b0d080475bbfce2ab559b3fcf2a513a5b (patch)
tree3f2902dbbe1ab2128ff1afad4be56c9e9417e494 /src/com/gitblit/client/EditUserDialog.java
parent87f6c3e6510986a6676872aa64aed66fe7f24b01 (diff)
downloadgitblit-ba54242b0d080475bbfce2ab559b3fcf2a513a5b.tar.gz
gitblit-ba54242b0d080475bbfce2ab559b3fcf2a513a5b.zip
Fixed null pointer exceptions Manager create User and Team
Diffstat (limited to 'src/com/gitblit/client/EditUserDialog.java')
-rw-r--r--src/com/gitblit/client/EditUserDialog.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/gitblit/client/EditUserDialog.java b/src/com/gitblit/client/EditUserDialog.java
index 5b789da5..da75867f 100644
--- a/src/com/gitblit/client/EditUserDialog.java
+++ b/src/com/gitblit/client/EditUserDialog.java
@@ -347,9 +347,14 @@ public class EditUserDialog extends JDialog {
restricted.add(repo.name);
}
}
+
// remove repositories for which user already has a permission
- for (RegistrantAccessPermission rp : permissions) {
- restricted.remove(rp.registrant);
+ if (permissions == null) {
+ permissions = new ArrayList<RegistrantAccessPermission>();
+ } else {
+ for (RegistrantAccessPermission rp : permissions) {
+ restricted.remove(rp.registrant);
+ }
}
StringUtils.sortRepositorynames(restricted);