Do not serialize the Logger instance

James Moger

2013-12-30 e92cef5abcbf6989e8ce58093b34b3ed909da4b8

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

@@ -25,20 +25,13 @@
import java.util.Map;

import java.util.Set;



import javax.inject.Inject;

import javax.inject.Singleton;

import javax.servlet.http.HttpServletResponse;



import com.gitblit.Constants;

import com.gitblit.Constants.FederationRequest;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.Constants.FederationRequest;

import com.gitblit.Keys.federation;

import com.gitblit.Keys.git;

import com.gitblit.Keys.groovy;

import com.gitblit.manager.IFederationManager;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.manager.IUserManager;

import com.gitblit.models.FederationModel;

import com.gitblit.models.FederationProposal;

@@ -50,37 +43,32 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TimeUtils;



import dagger.ObjectGraph;



/**

 * Handles federation requests.

 *

 * @author James Moger

 *

 */

@Singleton

public class FederationServlet extends JsonServlet {



   private static final long serialVersionUID = 1L;



   private final IStoredSettings settings;

   private IStoredSettings settings;



   private final IUserManager userManager;

   private IUserManager userManager;



   private final IRepositoryManager repositoryManager;

   private IRepositoryManager repositoryManager;



   private final IFederationManager federationManager;

   private IFederationManager federationManager;



   @Inject

   public FederationServlet(

         IRuntimeManager runtimeManager,

         IUserManager userManager,

         IRepositoryManager repositoryManager,

         IFederationManager federationManager) {



      super();

      this.settings = runtimeManager.getSettings();

      this.userManager = userManager;

      this.repositoryManager = repositoryManager;

      this.federationManager = federationManager;

   @Override

   protected void inject(ObjectGraph dagger) {

      this.settings = dagger.get(IStoredSettings.class);

      this.userManager = dagger.get(IUserManager.class);

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

      this.federationManager = dagger.get(IFederationManager.class);

   }



   /**