From 6d23cab9f5387ca2b57f60b26936ff8af0acc8fa Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 19 Oct 2012 22:45:30 -0400 Subject: [PATCH] Added UserModel null check --- src/com/gitblit/wicket/pages/EmptyRepositoryPage.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java index 133cdac..ad74af8 100644 --- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java +++ b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java @@ -26,6 +26,7 @@ import com.gitblit.Keys; import com.gitblit.models.RepositoryModel; import com.gitblit.utils.ArrayUtils; +import com.gitblit.wicket.GitblitRedirectException; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.RepositoryUrlPanel; @@ -34,8 +35,16 @@ public EmptyRepositoryPage(PageParameters params) { super(params); + setVersioned(false); + String repositoryName = WicketUtils.getRepositoryName(params); RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName); + + if (repository.hasCommits) { + // redirect to the summary page if this repository is not empty + throw new GitblitRedirectException(SummaryPage.class, params); + } + setupPage(repositoryName, getString("gb.emptyRepository")); List<String> repositoryUrls = new ArrayList<String>(); -- Gitblit v1.9.1