Fixed NPE with web.allowForking && !git.cacheRepositoryList (issue-182)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index f8a89b793ea640ce3bd654ad1452e319033ea9bf..a5bdb3e1b1341af60f91562fbee57d9a11bb4fea 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -1,14 +1,22 @@
 ## Release History\r
 \r
+### Current Release\r
+\r
+**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
+\r
+#### fixes\r
+\r
+- Fixed nullpointer when using web.allowForking = true && git.cacheRepositoryList = false (issue 182)\r
+\r
+### Older Releases\r
+\r
 <div class="alert alert-info">\r
 <h4>Update Note</h4>\r
-The permissions model has changed in this release.\r
+The permissions model has changed in the 1.2.0 release.\r
 <p>If you are updating your server, you must also update any Gitblit Manager and Federation Client installs to 1.2.0 as well.  The data model used by the RPC mechanism has changed slightly for the new permissions infrastructure.</p>\r
 </div>\r
 \r
-### Current Release\r
-\r
-**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*\r
+**1.2.0** *released 2012-12-31*\r
 \r
 #### fixes\r
 \r
@@ -107,8 +115,6 @@ If *realm.ldap.maintainTeams==true* **AND** *realm.ldap.admins* is not empty, th
 - added XZ for Java 1.0\r
 <hr/>\r
 \r
-### Older Releases\r
-\r
 <div class="alert alert-error">\r
 <h4>Update Note</h4>\r
 If you are updating from an earlier release AND you have indexed branches with the Lucene indexing feature, you need to be aware that this release will completely re-index your repositories.  Please be sure to provide ample heap resources as appropriate for your installation.\r

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 076bb765a14b5dcaae92bacf186b0cd4c63bbab1..b497737fba09a18fc7cf5346a4ecdfee7120828d 100644 (file)
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1739,7 +1739,7 @@ public class GitBlit implements ServletContextListener {
                        ProjectModel project = getProjectModel(userProject);\r
                        for (String repository : project.repositories) {\r
                                if (repository.startsWith(userProject)) {\r
-                                       RepositoryModel model = repositoryListCache.get(repository);\r
+                                       RepositoryModel model = getRepositoryModel(repository);\r
                                        if (model.originRepository.equalsIgnoreCase(origin)) {\r
                                                // user has a fork\r
                                                return model.name;\r