From fb9813874c811ae06604c30d875e9dce57df9874 Mon Sep 17 00:00:00 2001 From: SHaselbauer <sarah.haselbauer@akquinet.de> Date: Mon, 21 Jan 2013 16:28:11 -0500 Subject: [PATCH] Merge multiple owners feature (pull request #63, #66) --- 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