Fixed broken exception message formatting on starting GitDaemon

James Moger

2013-04-18 4065058ab87d1996d879e5dfc0a2131a7726082c

 src/main/java/com/gitblit/GitBlit.java

@@ -71,7 +71,6 @@
import org.eclipse.jgit.lib.RepositoryCache.FileKey;

import org.eclipse.jgit.lib.StoredConfig;

import org.eclipse.jgit.storage.file.FileBasedConfig;

import org.eclipse.jgit.storage.file.WindowCache;

import org.eclipse.jgit.storage.file.WindowCacheConfig;

import org.eclipse.jgit.util.FS;

import org.eclipse.jgit.util.FileUtils;

@@ -3006,7 +3005,7 @@
    * 

    * @return Map<String, SettingModel>

    */

   private ServerSettings loadSettingModels(InputStream referencePropertiesInputStream) {

   private ServerSettings loadSettingModels() {

      ServerSettings settingsModel = new ServerSettings();

      settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges();

      settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges();

@@ -3016,7 +3015,7 @@
         // Read bundled Gitblit properties to extract setting descriptions.

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

         // models map.

              InputStream is = referencePropertiesInputStream;

         InputStream is = getClass().getResourceAsStream("/reference.properties");

         BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is));

         StringBuilder description = new StringBuilder();

         SettingModel setting = new SettingModel();

@@ -3186,7 +3185,7 @@
      cfg.setPackedGitMMAP(settings.getBoolean(Keys.git.packedGitMmap, cfg.isPackedGitMMAP()));



      try {

         WindowCache.reconfigure(cfg);

         cfg.install();

         logger.debug(MessageFormat.format("{0} = {1,number,0}", Keys.git.packedGitWindowSize, cfg.getPackedGitWindowSize()));

         logger.debug(MessageFormat.format("{0} = {1,number,0}", Keys.git.packedGitLimit, cfg.getPackedGitLimit()));

         logger.debug(MessageFormat.format("{0} = {1,number,0}", Keys.git.deltaBaseCacheLimit, cfg.getDeltaBaseCacheLimit()));

@@ -3235,7 +3234,7 @@
            gitDaemon.start();

            logger.info(MessageFormat.format("Git daemon is listening on {0}:{1,number,0}", bindInterface, port));

         } catch (IOException e) {

            logger.error(MessageFormat.format("Failed to start Git daemon on {0}:{1,number.0}", bindInterface, port), e);

            logger.error(MessageFormat.format("Failed to start Git daemon on {0}:{1,number,0}", bindInterface, port), e);

         }

      }

   }

@@ -3266,11 +3265,7 @@
    * @see ServletContextListener.contextInitialize(ServletContextEvent)

    */

   @Override

        public void contextInitialized(ServletContextEvent contextEvent) {

       contextInitialized(contextEvent, getClass().getResourceAsStream("/reference.properties"));

   }



   public void contextInitialized(ServletContextEvent contextEvent, InputStream referencePropertiesInputStream) {

   public void contextInitialized(ServletContextEvent contextEvent) {

      servletContext = contextEvent.getServletContext();

      if (settings == null) {

         // Gitblit is running in a servlet container

@@ -3335,7 +3330,7 @@
         }

      }

      

      settingsModel = loadSettingModels(referencePropertiesInputStream);

      settingsModel = loadSettingModels();

      serverStatus.servletContainer = servletContext.getServerInfo();

   }