Reordered settings model loading to avoid WAR null pointer

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 565b024ab06efef25dedba0bde26801ce0f0d4dd..b4f6d6a163b7f1270d860619e000471b8c889562 100644 (file)
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1915,7 +1915,6 @@ public class GitBlit implements ServletContextListener {
        @Override\r
        public void contextInitialized(ServletContextEvent contextEvent) {\r
                servletContext = contextEvent.getServletContext();\r
-               settingsModel = loadSettingModels();\r
                if (settings == null) {\r
                        // Gitblit WAR is running in a servlet container\r
                        ServletContext context = contextEvent.getServletContext();\r
@@ -1954,7 +1953,8 @@ public class GitBlit implements ServletContextListener {
                                }\r
                        }\r
                }\r
-\r
+               \r
+               settingsModel = loadSettingModels();\r
                serverStatus.servletContainer = servletContext.getServerInfo();\r
        }\r
 \r