summaryrefslogtreecommitdiffstats
path: root/src/com/gitblit/ConfigUserService.java
diff options
context:
space:
mode:
authorRafael Cavazin <rafaelcavazin@gmail.com>2013-01-27 12:46:50 -0200
committerRafael Cavazin <rafaelcavazin@gmail.com>2013-01-27 12:46:50 -0200
commit06ae63123c94038b90153f4847de2c57c0193db8 (patch)
tree552bf7cfa3af0f314ac1337a12147b3ec515a1a5 /src/com/gitblit/ConfigUserService.java
parent71a71dad2df82bf8256c91bc48a600bafdef0d33 (diff)
parentc7acc2e1fa86102bb87e715c8fe4e336329fbcc6 (diff)
downloadgitblit-06ae63123c94038b90153f4847de2c57c0193db8.tar.gz
gitblit-06ae63123c94038b90153f4847de2c57c0193db8.zip
updating current development
Merge remote-tracking branch 'upstream/master' into translation_to_pt-br
Diffstat (limited to 'src/com/gitblit/ConfigUserService.java')
-rw-r--r--src/com/gitblit/ConfigUserService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/gitblit/ConfigUserService.java b/src/com/gitblit/ConfigUserService.java
index 068bbe3a..67ad0537 100644
--- a/src/com/gitblit/ConfigUserService.java
+++ b/src/com/gitblit/ConfigUserService.java
@@ -409,6 +409,10 @@ public class ConfigUserService implements IUserService {
// 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);