Reordered settings model loading to avoid WAR null pointer

James Moger

2012-05-05 b6db0de02630a131005cc73e126db42a37330710

Reordered settings model loading to avoid WAR null pointer

 src/com/gitblit/GitBlit.java

@@ -1915,7 +1915,6 @@
    @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 @@
                }

            }

        }



		
        settingsModel = loadSettingModels();

        serverStatus.servletContainer = servletContext.getServerInfo();

    }