Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -21,16 +21,16 @@
import java.io.InputStream;

import java.io.OutputStream;



import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletContext;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import com.gitblit.Keys;

import com.gitblit.dagger.DaggerServlet;

import com.gitblit.manager.IRuntimeManager;



import dagger.ObjectGraph;



/**

 * Handles requests for logo.png

@@ -38,7 +38,8 @@
 * @author James Moger

 *

 */

public class LogoServlet extends DaggerServlet {

@Singleton

public class LogoServlet extends HttpServlet {



   private static final long serialVersionUID = 1L;



@@ -46,9 +47,9 @@


   private IRuntimeManager runtimeManager;



   @Override

   protected void inject(ObjectGraph dagger) {

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

   @Inject

   public LogoServlet(IRuntimeManager runtimeManager) {

      this.runtimeManager = runtimeManager;

   }



   @Override