From 4fea450fd3edfba6bb9e2c3c0a9231c6d227a09c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 23 Feb 2012 19:49:46 -0500
Subject: [PATCH] Fixed nullpointer on pushing to an empty repository (issue 69)
---
src/com/gitblit/GitblitUserService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/GitblitUserService.java b/src/com/gitblit/GitblitUserService.java
index 122c21b..7462af0 100644
--- a/src/com/gitblit/GitblitUserService.java
+++ b/src/com/gitblit/GitblitUserService.java
@@ -95,8 +95,8 @@
logger.info(MessageFormat.format("Automatically creating {0} based on {1}",
usersConfig.getAbsolutePath(), realmFile.getAbsolutePath()));
ConfigUserService configService = new ConfigUserService(usersConfig);
- for (String username : serviceImpl.getAllUsernames()) {
- UserModel userModel = serviceImpl.getUserModel(username);
+ for (String username : service.getAllUsernames()) {
+ UserModel userModel = service.getUserModel(username);
configService.updateUserModel(userModel);
}
}
@@ -162,11 +162,21 @@
}
@Override
+ public List<UserModel> getAllUsers() {
+ return serviceImpl.getAllUsers();
+ }
+
+ @Override
public List<String> getAllTeamNames() {
return serviceImpl.getAllTeamNames();
}
@Override
+ public List<TeamModel> getAllTeams() {
+ return serviceImpl.getAllTeams();
+ }
+
+ @Override
public List<String> getTeamnamesForRepositoryRole(String role) {
return serviceImpl.getTeamnamesForRepositoryRole(role);
}
--
Gitblit v1.9.1