diff options
| author | James Moger <james.moger@gitblit.com> | 2013-06-11 15:50:13 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-06-11 15:50:13 -0400 |
| commit | 9788200234dfe222989823c6160d2be40fd84415 (patch) | |
| tree | 6dea94207431ad05a064cfd3196d3bf5dde43b62 /src/main/java/com/gitblit/GitBlit.java | |
| parent | cedf138f3c9afeae7bcbda5dbb0511ebec297d10 (diff) | |
| download | gitblit-9788200234dfe222989823c6160d2be40fd84415.tar.gz gitblit-9788200234dfe222989823c6160d2be40fd84415.zip | |
Improve NPE handling for hook script enumeration (issue-253)
Diffstat (limited to 'src/main/java/com/gitblit/GitBlit.java')
| -rw-r--r-- | src/main/java/com/gitblit/GitBlit.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java index df17edd9..c538acea 100644 --- a/src/main/java/com/gitblit/GitBlit.java +++ b/src/main/java/com/gitblit/GitBlit.java @@ -3009,7 +3009,9 @@ public class GitBlit implements ServletContextListener { if (repository != null) { for (String teamname : userService.getTeamnamesForRepositoryRole(repository.name)) { TeamModel team = userService.getTeamModel(teamname); - scripts.addAll(team.preReceiveScripts); + if (!ArrayUtils.isEmpty(team.preReceiveScripts)) { + scripts.addAll(team.preReceiveScripts); + } } } return new ArrayList<String>(scripts); @@ -3059,7 +3061,9 @@ public class GitBlit implements ServletContextListener { if (repository != null) { for (String teamname : userService.getTeamnamesForRepositoryRole(repository.name)) { TeamModel team = userService.getTeamModel(teamname); - scripts.addAll(team.postReceiveScripts); + if (!ArrayUtils.isEmpty(team.postReceiveScripts)) { + scripts.addAll(team.postReceiveScripts); + } } } return new ArrayList<String>(scripts); |