Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/servlet/RpcFilter.java

@@ -18,8 +18,8 @@
import java.io.IOException;

import java.text.MessageFormat;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.FilterChain;

import javax.servlet.ServletException;

import javax.servlet.ServletRequest;

@@ -30,8 +30,8 @@
import com.gitblit.Constants.RpcRequest;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.manager.IAuthenticationManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.models.UserModel;



/**

@@ -50,17 +50,19 @@
@Singleton

public class RpcFilter extends AuthenticationFilter {



   private final IStoredSettings settings;

   private IStoredSettings settings;



   private final IRuntimeManager runtimeManager;

   private IRuntimeManager runtimeManager;



   @Inject

   public RpcFilter(

         IStoredSettings settings,

         IRuntimeManager runtimeManager,

         IAuthenticationManager authenticationManager) {



      super(authenticationManager);

      this.settings = runtimeManager.getSettings();



      this.settings = settings;

      this.runtimeManager = runtimeManager;

   }