From 65d5bb3f1cbfb42be5a3c4aa077b7ab2504082af Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Dec 2013 23:12:12 -0500
Subject: [PATCH] Rollback to Servlet 2.5
---
src/main/java/com/gitblit/servlet/RpcFilter.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/RpcFilter.java b/src/main/java/com/gitblit/servlet/RpcFilter.java
index fc83872..e0b1a23 100644
--- a/src/main/java/com/gitblit/servlet/RpcFilter.java
+++ b/src/main/java/com/gitblit/servlet/RpcFilter.java
@@ -28,9 +28,10 @@
import com.gitblit.Constants.RpcRequest;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.models.UserModel;
+
+import dagger.ObjectGraph;
/**
* The RpcFilter is a servlet filter that secures the RpcServlet.
@@ -47,17 +48,15 @@
*/
public class RpcFilter extends AuthenticationFilter {
- private final IStoredSettings settings;
+ private IStoredSettings settings;
- private final IRuntimeManager runtimeManager;
+ private IRuntimeManager runtimeManager;
- public RpcFilter(
- IRuntimeManager runtimeManager,
- IAuthenticationManager authenticationManager) {
-
- super(authenticationManager);
- this.settings = runtimeManager.getSettings();
- this.runtimeManager = runtimeManager;
+ @Override
+ protected void inject(ObjectGraph dagger) {
+ super.inject(dagger);
+ this.settings = dagger.get(IStoredSettings.class);
+ this.runtimeManager = dagger.get(IRuntimeManager.class);
}
/**
--
Gitblit v1.9.1