From 3286926d2ec11445f76cd170e4c2fcff597a0754 Mon Sep 17 00:00:00 2001 From: Fabrice Bacchella <fbacchella@spamcop.net> Date: Tue, 26 May 2015 04:48:40 -0400 Subject: [PATCH] Two slight improvement for custom UserService: - try userRealm as a file only if class is not found, other exeptions are real error - log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString --- src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java b/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java index 42f4694..c26c975 100644 --- a/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java +++ b/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java @@ -24,7 +24,6 @@ import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; -import com.gitblit.GitBlit; import com.gitblit.models.FederationModel; import com.gitblit.models.FederationModel.RepositoryStatus; import com.gitblit.wicket.WicketUtils; @@ -39,7 +38,7 @@ String url = WicketUtils.getUrlParameter(params); String name = WicketUtils.getNameParameter(params); - FederationModel registration = GitBlit.self().getFederationRegistration(url, name); + FederationModel registration = app().federation().getFederationRegistration(url, name); if (registration == null) { error(getString("gb.couldNotFindFederationRegistration"), true); } -- Gitblit v1.9.1