Fix building gitblit with stable-2.12

See https://gerrit-ci.gerritforge.com/job/plugin-gitblit-stable-2.12/3/console

12:23:50 /home/jenkins/workspace/plugin-gitblit-stable-2.12/plugins/gitblit/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java:92: error: cannot find symbol
12:23:50     request.setAttribute("gerrit-username", webSession.get().getCurrentUser()
12:23:50                                                             ^
12:23:50   symbol:   method getCurrentUser()
12:23:50   location: interface com.google.gerrit.httpd.WebSession
12:23:50 /home/jenkins/workspace/plugin-gitblit-stable-2.12/plugins/gitblit/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java:99: error: cannot find symbol
12:23:50     if (!session.getCurrentUser().getUserName().equals(username)) {
12:23:50                 ^
12:23:50   symbol:   method getCurrentUser()
12:23:50   location: variable session of type com.google.gerrit.httpd.WebSession
12:23:50 /home/jenkins/workspace/plugin-gitblit-stable-2.12/plugins/gitblit/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java:-1: note: /home/jenkins/workspace/plugin-gitblit-stable-2.12/plugins/gitblit/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java uses or overrides a deprecated API.
12:23:50 
12:23:50 /home/jenkins/workspace/plugin-gitblit-stable-2.12/plugins/gitblit/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java:-1: note: Recompile with -Xlint:deprecation for details.
12:23:50 
12:23:50 Errors: 2. Warnings: 1.

Change-Id: I7bab26a12f075a3439735f993d735c17c7969b53
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java
index b898ba9..9bd6c62 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritAuthFilter.java
@@ -89,7 +89,7 @@
 
   public boolean filterSessionAuth(final DynamicItem<WebSession> webSession,
       HttpServletRequest request) {
-    request.setAttribute("gerrit-username", webSession.get().getCurrentUser()
+    request.setAttribute("gerrit-username", webSession.get().getUser()
         .getUserName());
     request.setAttribute("gerrit-token", webSession.get().getSessionId());
     return true;
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 c76065e..5014fa5 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
@@ -96,7 +96,7 @@
       return null;
     }
 
-    if (!session.getCurrentUser().getUserName().equals(username)) {
+    if (!session.getUser().getUserName().equals(username)) {
       log.warn("Gerrit session " + session.getSessionId()
           + " is not assigned to user " + username);
       return null;
@@ -118,7 +118,7 @@
     try {
       AuthResult authResp = accountManager.authenticate(who);
       webSession.get().login(authResp, false);
-    } catch (AccountException e) {
+    } catch (Exception e) {
       log.warn("Authentication failed for '" + username + "'", e);
       return null;
     }