James Moger
2013-07-25 d5bdbdf6f0d54d4753f35a9b519fb7da2c2a9da7
Fixed Gitblit Authority failing to load realm.NNN.backingUserService (issue-280)
1 files modified
9 ■■■■■ changed files
src/main/java/com/gitblit/authority/GitblitAuthority.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/authority/GitblitAuthority.java
@@ -261,12 +261,9 @@
        String us = gitblitSettings.getString(Keys.realm.userService, "${baseFolder}/users.conf");
        String ext = us.substring(us.lastIndexOf(".") + 1).toLowerCase();
        IUserService service = null;
        if (!ext.equals("conf") && !ext.equals("properties")) {
            if (us.equals("com.gitblit.LdapUserService")) {
                us = gitblitSettings.getString(Keys.realm.ldap.backingUserService, "${baseFolder}/users.conf");
            } else if (us.equals("com.gitblit.LdapUserService")) {
                us = gitblitSettings.getString(Keys.realm.redmine.backingUserService, "${baseFolder}/users.conf");
            }
        if (!ext.equals("conf") && !ext.equals("properties") && ext.contains("userservice")) {
            String realm = ext.substring(0, ext.indexOf("userservice"));
            us = gitblitSettings.getString(MessageFormat.format("realm.{0}.backingUserService", realm), "${baseFolder}/users.conf");
        }
        if (us.endsWith(".conf")) {