commit 4c0af16c4ee14042ff7a9bb33c5bec3a94786da5
author David Pursehouse <dpursehouse@collab.net> Sat Oct 21 01:53:47 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 21 01:53:47 2017 +0000
tree 4dce7e8fa03b981eb6b823dae533a18397ba65f5
parent 1dd0a77d2343c38eb344f7ea4d564439fb6c9b0b
parent fccc9851760b93c7d6e3772435c045848988b6bf

Merge "Fix check for group index in GroupCacheImpl.ByIdLoader"

gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java
index 7887929..f1112de 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java
@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
+import java.util.function.BooleanSupplier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -150,7 +151,7 @@
   static class ByIdLoader extends CacheLoader<AccountGroup.Id, Optional<InternalGroup>> {
     private final SchemaFactory<ReviewDb> schema;
     private final Groups groups;
-    private final boolean hasGroupIndex;
+    private final BooleanSupplier hasGroupIndex;
     private final Provider<InternalGroupQuery> groupQueryProvider;
 
     @Inject
@@ -161,13 +162,13 @@
         Provider<InternalGroupQuery> groupQueryProvider) {
       this.schema = schema;
       this.groups = groups;
-      this.hasGroupIndex = groupIndexCollection.getSearchIndex() != null;
+      hasGroupIndex = () -> groupIndexCollection.getSearchIndex() != null;
       this.groupQueryProvider = groupQueryProvider;
     }
 
     @Override
     public Optional<InternalGroup> load(AccountGroup.Id key) throws Exception {
-      if (hasGroupIndex) {
+      if (hasGroupIndex.getAsBoolean()) {
         return groupQueryProvider.get().byId(key);
       }