Adapt to the latest Gerrit on stable-2.14 Add the extra parameter AccountCache for supporting the latest security fix on stable-2.14 for blocking users that have been set inactive. Bug: Issue 12717 Change-Id: I7bc8d0b00fbde5538ee9125aecd2c5ebd5c0742b
diff --git a/src/main/java/com/googlesource/gerrit/plugins/websession/flatfile/FlatFileWebSession.java b/src/main/java/com/googlesource/gerrit/plugins/websession/flatfile/FlatFileWebSession.java index 813e392..c3d0c8e 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/websession/flatfile/FlatFileWebSession.java +++ b/src/main/java/com/googlesource/gerrit/plugins/websession/flatfile/FlatFileWebSession.java
@@ -21,6 +21,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.config.AuthConfig; import com.google.inject.AbstractModule; import com.google.inject.Inject; @@ -51,13 +52,15 @@ FlatFileWebSessionCache 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); } }