From ba54242b0d080475bbfce2ab559b3fcf2a513a5b Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 22 Oct 2012 16:16:57 -0400 Subject: [PATCH] Fixed null pointer exceptions Manager create User and Team --- src/com/gitblit/client/EditTeamDialog.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/client/EditTeamDialog.java b/src/com/gitblit/client/EditTeamDialog.java index 4eb0729..81146fc 100644 --- a/src/com/gitblit/client/EditTeamDialog.java +++ b/src/com/gitblit/client/EditTeamDialog.java @@ -49,6 +49,7 @@ import com.gitblit.models.RepositoryModel; import com.gitblit.models.ServerSettings; import com.gitblit.models.TeamModel; +import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.StringUtils; public class EditTeamDialog extends JDialog { @@ -316,8 +317,12 @@ } // remove repositories for which team 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); -- Gitblit v1.9.1