Preserve key index when re-adding an existing key

James Moger

2014-03-27 ab07d0d86d8b64b4f7c88b45bc81f1eec22105db

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

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

import java.text.MessageFormat;



import javax.inject.Inject;

import javax.inject.Singleton;

import javax.servlet.FilterChain;

import javax.servlet.ServletException;

import javax.servlet.ServletRequest;

@@ -31,10 +29,11 @@
import com.gitblit.manager.IProjectManager;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.manager.IAuthenticationManager;

import com.gitblit.models.ProjectModel;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;



import dagger.ObjectGraph;



/**

 * The SyndicationFilter is an AuthenticationFilter which ensures that feed

@@ -44,24 +43,18 @@
 * @author James Moger

 *

 */

@Singleton

public class SyndicationFilter extends AuthenticationFilter {



   private final IRuntimeManager runtimeManager;

   private final IRepositoryManager repositoryManager;

   private final IProjectManager projectManager;

   private IRuntimeManager runtimeManager;

   private IRepositoryManager repositoryManager;

   private IProjectManager projectManager;



   @Inject

   public SyndicationFilter(

         IRuntimeManager runtimeManager,

         IAuthenticationManager authenticationManager,

         IRepositoryManager repositoryManager,

         IProjectManager projectManager) {



      super(authenticationManager);

      this.runtimeManager = runtimeManager;

      this.repositoryManager = repositoryManager;

      this.projectManager = projectManager;

   @Override

   protected void inject(ObjectGraph dagger) {

      super.inject(dagger);

      this.runtimeManager = dagger.get(IRuntimeManager.class);

      this.repositoryManager = dagger.get(IRepositoryManager.class);

      this.projectManager = dagger.get(IProjectManager.class);

   }



   /**