commit 434eee643d5ea5bab8642d26aff045e0f6db6493
author Luca Milanesio <luca.milanesio@gmail.com> Sat Jun 13 23:09:41 2015 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Tue Jun 16 07:11:49 2015 +0000
tree 7a566440bfb7d686192a578209dd5fd280198563
parent c8cce633d859f532b8e559a242a2a8e032374e61

Align with Gitblit 1.7.0-SNAPSHOT (latest development branch)

Change-Id: I11c8d3b9ced133aaab5bd709fac0d6c09e077612

src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
index a4bbb2c..229416c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
@@ -144,16 +144,21 @@
     String gerritToken = (String) httpRequest.getAttribute("gerrit-token");
     httpRequest.getSession().setAttribute(Constants.AUTHENTICATION_TYPE,
         AuthenticationType.CONTAINER);
-    
+
     if (Strings.isNullOrEmpty(gerritUsername)
         || Strings.isNullOrEmpty(gerritToken)) {
       return GerritToGitBlitUserModel.getAnonymous(projectControl);
-    } else {      
+    } else {
       return authenticateSSO(gerritUsername, gerritToken);
     }
   }
 
   @Override
+  public UserModel authenticate(String username) {
+    return null;
+  }
+
+  @Override
   public UserModel authenticate(String username, SshKey key) {
     return null;
   }