commit 0861998ae1b3d1daefa6c0d13ab3905b0223b0e0
author David Pursehouse <dpursehouse@digital.ai> Fri May 22 22:14:51 2020 +0900
committer David Pursehouse <dpursehouse@digital.ai> Fri May 22 22:14:51 2020 +0900
tree bdf7244117395bc6313bc4e694bf6941bcfa928a
parent 3425415eaf58a694772a02f8854cb46624af6666
parent ac9768dcf78cb654130dce987fda49e15182eff0

Merge branch 'stable-3.2'

* stable-3.2:
  Update git submodules
  Update git submodules
  UniversalGroupBackend: Fix comparison of boxed Boolean as primitive
  UniversalGroupBackend: Replace repeated log statements with single log
  Fix ModifyCollectionInEnhancedForLoop warning flagged by error prone
  Update git submodules

Change-Id: I427116d888478ff2367222d0d78929c3a6ecfb78

java/com/google/gerrit/server/account/UniversalGroupBackend.java

diff --git a/java/com/google/gerrit/server/account/UniversalGroupBackend.java b/java/com/google/gerrit/server/account/UniversalGroupBackend.java
index e1ee09d..fddbd2b 100644
--- a/java/com/google/gerrit/server/account/UniversalGroupBackend.java
+++ b/java/com/google/gerrit/server/account/UniversalGroupBackend.java
@@ -60,7 +60,7 @@
   private GroupBackend backend(AccountGroup.UUID uuid) {
     if (uuid != null) {
       for (PluginSetEntryContext<GroupBackend> c : backends) {
-        if (c.call(b -> b.handles(uuid))) {
+        if (Boolean.TRUE.equals(c.call(b -> b.handles(uuid)))) {
           return c.get();
         }
       }
@@ -116,6 +116,7 @@
           }
         }
       }
+      logger.atFine().log("Unknown GroupMembership for UUID: %s", uuid);
       return null;
     }
 
@@ -126,7 +127,6 @@
       }
       GroupMembership m = membership(uuid);
       if (m == null) {
-        logger.atFine().log("Unknown GroupMembership for UUID: %s", uuid);
         return false;
       }
       return m.contains(uuid);
@@ -142,7 +142,6 @@
         }
         GroupMembership m = membership(uuid);
         if (m == null) {
-          logger.atFine().log("Unknown GroupMembership for UUID: %s", uuid);
           continue;
         }
         lookups.put(m, uuid);
@@ -198,7 +197,7 @@
   @Override
   public boolean isVisibleToAll(AccountGroup.UUID uuid) {
     for (PluginSetEntryContext<GroupBackend> c : backends) {
-      if (c.call(b -> b.handles(uuid))) {
+      if (Boolean.TRUE.equals(c.call(b -> b.handles(uuid)))) {
         return c.call(b -> b.isVisibleToAll(uuid));
       }
     }