Set default federation strategy in model (issue 20)

diff --git a/docs/00_index.mkd b/docs/00_index.mkd
index 48d373b76526d679077a14c638f3280fdf743498..2c40e1ef0c37acdc1ac48a638950167b0cb0b8c0 100644 (file)
--- a/docs/00_index.mkd
+++ b/docs/00_index.mkd
@@ -28,6 +28,7 @@ Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit
 \r
 **%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
 \r
+- fixed: Null pointer exception if did not set federation strategy (issue 20)\r
 - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later\r
 - added: IUserService.setup(IStoredSettings) for custom user service implementations\r
 \r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index c63f6ebd0be0cdb67da09a3283a829d427942847..667e5f2e0a0b282be6b8184ef145a288654fd53d 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -3,6 +3,7 @@
 ### Current Release\r
 **%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%*\r
 \r
+- fixed: Null pointer exception if did not set federation strategy (issue 20)\r
 - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later\r
 - added: IUserService.setup(IStoredSettings) for custom user service implementations\r
 \r

diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index 0f1a676bc7cff0b5c97c61f0c10bfe89f3a6fd7d..e85fd6a5982475974a5089ef524cbc39cee19335 100644 (file)
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -63,7 +63,8 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel
                this.owner = owner;\r
                this.lastChange = lastchange;\r
                this.accessRestriction = AccessRestrictionType.NONE;\r
-               federationSets = new ArrayList<String>();\r
+               this.federationSets = new ArrayList<String>();\r
+               this.federationStrategy = FederationStrategy.FEDERATE_THIS;\r
        }\r
 \r
        @Override\r