Merged #254 "Two slight improvement for custom UserService"

James Moger

2015-05-26 423c8704165370d1785fd5ef956e8e4bf0952982

Merged #254 "Two slight improvement for custom UserService"

 src/main/java/com/gitblit/manager/UserManager.java

@@ -83,9 +83,9 @@
     * @param userService
     */
    public void setUserService(IUserService userService) {
        logger.info(userService.toString());
        this.userService = userService;
        this.userService.setup(runtimeManager);
        logger.info(userService.toString());
    }

    @Override
@@ -115,10 +115,12 @@
                    // check to see if this "file" is a custom user service class
                    Class<?> realmClass = Class.forName(realm);
                    service = (IUserService) realmClass.newInstance();
                } catch (Throwable t) {
                } catch (ClassNotFoundException t) {
                    // typical file path configuration
                    File realmFile = runtimeManager.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf");
                    service = createUserService(realmFile);
                } catch (InstantiationException | IllegalAccessException  e) {
                    logger.error("failed to instanciate user service {}: {}", realm, e.getMessage());
                }
            }
            setUserService(service);