commit dc824d5c43d8d09ef324c4d5a95af0228e3001fd
author Nasser Grainawi <nasser@codeaurora.org> Wed Sep 22 19:51:07 2021 -0600
committer Nasser Grainawi <nasser@codeaurora.org> Wed Sep 22 19:51:07 2021 -0600
tree 2284f3965bbfd80b754e720eb13c5ce6a0a65bb0
parent 1ce50ed01d43270cde8214a0308680166661f10a
parent 854e55ec22dadfc76b1112eb086f0d20dd4a977c

Merge branch 'stable-2.11' into stable-2.12

* stable-2.11:
  ListAccess: Fix incorrect behavior when group appears twice for same rule

Change-Id: Ida30dac5678525b5eb15f80c1dc7a694d9f001bd

gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java
index 93a3814..b186617 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java
@@ -273,7 +273,7 @@
       exclusive = toBoolean(permission.getExclusiveGroup());
       rules = Maps.newHashMap();
       for (PermissionRule r : permission.getRules()) {
-        rules.put(r.getGroup().getUUID().get(), new PermissionRuleInfo(r));
+        rules.putIfAbsent(r.getGroup().getUUID().get(), new PermissionRuleInfo(r)); // First entry for the group wins
       }
     }
   }