Empty repository page failed to handle missing repository (issue 160)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index a8813c503675a1f507c7027f498bb93bd5c8f6bc..d0d24fe710fac9e1ee522ece7f467ff3811b117a 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -12,6 +12,7 @@ The permissions model has changed in this release.
 \r
 #### fixes\r
 \r
+- Empty repository page failed to handle missing repository (issue 160)\r
 - Fixed broken ticgit urls (issue 157)\r
 - Exclude submodules from zip downloads (issue 151)\r
 - Fixed bug where repository ownership was not updated on rename user\r

diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index ad74af8cde6609e7fb936578c4e8299022df8c6c..be0dad9e07f87f126ca2b9adc411c63a7e1f62db 100644 (file)
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -39,6 +39,9 @@ public class EmptyRepositoryPage extends RootPage {
 \r
                String repositoryName = WicketUtils.getRepositoryName(params);\r
                RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName);\r
+               if (repository == null) {\r
+                       error(getString("gb.canNotLoadRepository") + " " + repositoryName, true);\r
+               }\r
                \r
                if (repository.hasCommits) {\r
                        // redirect to the summary page if this repository is not empty\r