From 0fe9792a9f194e68288c377810c33973d117923f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 13 Dec 2013 08:12:47 -0500 Subject: [PATCH] Use multiple mappings for the git servlet instead of multiple instances --- src/main/java/com/gitblit/servlet/RpcServlet.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gitblit/servlet/RpcServlet.java b/src/main/java/com/gitblit/servlet/RpcServlet.java index a5d892f..e7b3ed2 100644 --- a/src/main/java/com/gitblit/servlet/RpcServlet.java +++ b/src/main/java/com/gitblit/servlet/RpcServlet.java @@ -47,6 +47,8 @@ import com.gitblit.utils.RpcUtils; import com.gitblit.utils.StringUtils; +import dagger.ObjectGraph; + /** * Handles remote procedure calls. * @@ -59,16 +61,14 @@ public static final int PROTOCOL_VERSION = 6; - private final IStoredSettings settings; + private IStoredSettings settings; - private final IGitblit gitblit; + private IGitblit gitblit; - public RpcServlet(IGitblit gitblit) { - - super(); - - this.settings = gitblit.getSettings(); - this.gitblit = gitblit; + @Override + protected void inject(ObjectGraph dagger) { + this.settings = dagger.get(IStoredSettings.class); + this.gitblit = dagger.get(IGitblit.class); } /** -- Gitblit v1.9.1