Reordered settings model loading to avoid WAR null pointer

1 files changed, 2 insertions, 2 deletions

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();

 	}