commit 59b6b0b87fa02e5a58c65755d745a0645d303736
author Luca Milanesio <luca.milanesio@gmail.com> Sun Jun 07 23:30:15 2020 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Sun Jun 07 22:31:19 2020 +0000
tree e91c033ea77205a35497af2b4ed0bcd6cc08abd8
parent 889467c68ec288b87c01ee1102aa0c857f3bb224

Adapt to the latest Gerrit on stable-3.0

Add the extra parameter AccountCache for supporting
the latest security fix on stable-3.0 for blocking
users that have been set inactive.

Bug: Issue 12717
Change-Id: I6b22fcdb7c242a9a1458823314d4413de182dc8a

src/main/java/com/googlesource/gerrit/plugins/websession/broker/BrokerBasedWebSession.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/websession/broker/BrokerBasedWebSession.java b/src/main/java/com/googlesource/gerrit/plugins/websession/broker/BrokerBasedWebSession.java
index 0ad019c..00a90ee 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/websession/broker/BrokerBasedWebSession.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/websession/broker/BrokerBasedWebSession.java
@@ -22,6 +22,7 @@
 import com.google.gerrit.httpd.WebSessionManagerFactory;
 import com.google.gerrit.server.AnonymousUser;
 import com.google.gerrit.server.IdentifiedUser.RequestFactory;
+import com.google.gerrit.server.account.AccountCache;
 import com.google.gerrit.server.cache.CacheModule;
 import com.google.gerrit.server.config.AuthConfig;
 import com.google.gerrit.server.events.EventTypes;
@@ -87,13 +88,15 @@
       BrokerBasedWebSessionCache cache,
       AuthConfig authConfig,
       Provider<AnonymousUser> anonymousProvider,
-      RequestFactory identified) {
+      RequestFactory identified,
+      AccountCache byIdCache) {
     super(
         request.get(),
         response.get(),
         managerFactory.create(cache),
         authConfig,
         anonymousProvider,
-        identified);
+        identified,
+        byIdCache);
   }
 }