From 619291b080176f65b85fe9ca4d0df56cb9ad8393 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Dec 2013 10:29:25 -0500
Subject: [PATCH] Fix NPE on usermodel account type checking
---
src/main/java/com/gitblit/wicket/GitblitWicketFilter.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitblitWicketFilter.java b/src/main/java/com/gitblit/wicket/GitblitWicketFilter.java
index bc65d77..9e55470 100644
--- a/src/main/java/com/gitblit/wicket/GitblitWicketFilter.java
+++ b/src/main/java/com/gitblit/wicket/GitblitWicketFilter.java
@@ -26,7 +26,6 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitblit.GitBlit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.manager.IProjectManager;
@@ -47,7 +46,24 @@
*/
public class GitblitWicketFilter extends WicketFilter {
- public GitblitWicketFilter() {
+ private final IStoredSettings settings;
+
+ private final IRuntimeManager runtimeManager;
+
+ private final IRepositoryManager repositoryManager;
+
+ private final IProjectManager projectManager;
+
+ private final GitBlitWebApp webapp;
+
+ public GitblitWicketFilter(GitBlitWebApp webapp) {
+
+ super();
+ this.settings = webapp.settings();
+ this.runtimeManager = webapp.runtime();
+ this.repositoryManager = webapp.repositories();
+ this.projectManager = webapp.projects();
+ this.webapp = webapp;
}
@Override
@@ -55,7 +71,7 @@
return new IWebApplicationFactory() {
@Override
public WebApplication createApplication(WicketFilter filter) {
- return new GitBlitWebApp();
+ return webapp;
}
};
}
@@ -96,11 +112,6 @@
if (!StringUtils.isEmpty(servletRequest.getParameter("h"))) {
commitId = servletRequest.getParameter("h");
}
-
- IRuntimeManager runtimeManager = GitBlit.getManager(IRuntimeManager.class);
- IStoredSettings settings = runtimeManager.getSettings();
- IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);
- IProjectManager projectManager = GitBlit.getManager(IProjectManager.class);
repo = repo.replace("%2f", "/").replace("%2F", "/").replace(settings.getChar(Keys.web.forwardSlashCharacter, '/'), '/');
--
Gitblit v1.9.1