From: James Moger <james.moger@gitblit.com>
Date: Sat, 5 May 2012 19:37:28 +0000 (-0400)
Subject: Reordered settings model loading to avoid WAR null pointer
X-Git-Tag: v1.0.0~55
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b6db0de02630a131005cc73e126db42a37330710;p=gitblit.git

Reordered settings model loading to avoid WAR null pointer
---

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