From 94ef80069e978137edc74cb428d4d52cdedbae5c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 23 Jan 2013 08:31:35 -0500 Subject: [PATCH] Merge branch 'fogbugz' of https://github.com/djschny/gitblit --- src/com/gitblit/ConfigUserService.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/com/gitblit/ConfigUserService.java b/src/com/gitblit/ConfigUserService.java index 068bbe3..67ad053 100644 --- a/src/com/gitblit/ConfigUserService.java +++ b/src/com/gitblit/ConfigUserService.java @@ -409,6 +409,10 @@ // Read realm file read(); UserModel model = users.remove(username.toLowerCase()); + if (model == null) { + // user does not exist + return false; + } // remove user from team for (TeamModel team : model.teams) { TeamModel t = teams.get(team.name); -- Gitblit v1.9.1