Reordered settings model loading to avoid WAR null pointer

James Moger

2012-05-05 b6db0de02630a131005cc73e126db42a37330710

 src/com/gitblit/GitBlit.java

@@ -388,6 +388,22 @@


   /**

    * 

    * @return true if the user service supports display name changes

    */

   public boolean supportsDisplayNameChanges() {

      return userService.supportsDisplayNameChanges();

   }



   /**

    * 
    * @return true if the user service supports email address changes

    */

   public boolean supportsEmailAddressChanges() {

      return userService.supportsEmailAddressChanges();

   }



   /**

    * 
    * @return true if the user service supports team membership changes

    */

   public boolean supportsTeamMembershipChanges() {

@@ -1780,6 +1796,10 @@
    */

   private ServerSettings loadSettingModels() {

      ServerSettings settingsModel = new ServerSettings();

      settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges();

      settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges();

      settingsModel.supportsEmailAddressChanges = userService.supportsEmailAddressChanges();

      settingsModel.supportsTeamMembershipChanges = userService.supportsTeamMembershipChanges();

      try {

         // Read bundled Gitblit properties to extract setting descriptions.

         // This copy is pristine and only used for populating the setting

@@ -1895,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();

@@ -1934,7 +1953,8 @@
            }

         }

      }



		
      settingsModel = loadSettingModels();

      serverStatus.servletContainer = servletContext.getServerInfo();

   }