Merged #219 "Update to Guice 4.0-beta5"

James Moger

2014-11-04 02c6a8c24505625c5f411c0af1019c7c1f443d07

 src/main/java/com/gitblit/git/RepositoryResolver.java

@@ -83,8 +83,8 @@
   protected boolean isExportOk(X req, String repositoryName, Repository db) throws IOException {
      RepositoryModel model = gitblit.getRepositoryModel(repositoryName);

      UserModel user = UserModel.ANONYMOUS;
      String scheme = null;
      UserModel user = null;
      String origin = null;

      if (req instanceof GitDaemonClient) {
@@ -93,7 +93,6 @@
         GitDaemonClient client = (GitDaemonClient) req;
         scheme = "git";
         origin = client.getRemoteAddress().toString();
         user = UserModel.ANONYMOUS;
      } else if (req instanceof HttpServletRequest) {
         // http/https request
         HttpServletRequest client = (HttpServletRequest) req;