Gitblit devel
parent: f8c1913b | patch | commit | ignore whitespace
James Moger
2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 
Merge overrides in addition to merging the normal settings

Some command-line parameters are ignored due to a bug in the merge
settings method which merges overrides into the normal settings map.
This works fine until the settings class decides to reload from the
pristine settings file which dumps the explicitly overrides.

The solution is to merge the overrides in addition to the standard
settings.
1 files modified
1 ■■■■■ changed files
src/main/java/com/gitblit/IStoredSettings.java 1 ●●●●● patch | view | raw | blame | history 
 src/main/java/com/gitblit/IStoredSettings.java


@@ -359,5 +359,6 @@


     */



    public void merge(IStoredSettings settings) {



        getSettings().putAll(settings.getSettings());



        overrides.putAll(settings.overrides);



    }



}