diff options
| author | Nasser Grainawi <nasser@codeaurora.org> | 2021-11-11 12:37:01 -0700 |
|---|---|---|
| committer | Nasser Grainawi <nasser@codeaurora.org> | 2021-11-11 12:37:01 -0700 |
| commit | 4e81b56abf0e75af66cc9fe45d6e0ed557d54bd8 (patch) | |
| tree | 15fac2121d2579e44bc2cb3a073b6c29d10b51df | |
| parent | b8813cc48ffa548bcbe0ca939d1dab05a1088752 (diff) | |
| parent | 44ef71035a53f527a0821d6ea195d32caeaafe90 (diff) | |
Merge branch 'stable-2.12' into stable-2.13
* stable-2.12:
Change bouncycastle urls
ListAccess: Fix incorrect behavior when group appears twice for same rule
Change-Id: Ibd331bef8541e965b582a12c58d061193497d858
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java index 8effe443f9..a6b24459d7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java @@ -247,7 +247,7 @@ public class GetAccess implements RestReadView<ProjectResource> { } AccountGroup.UUID group = r.getGroup().getUUID(); if (group != null) { - pInfo.rules.put(group.get(), info); + pInfo.rules.putIfAbsent(group.get(), info); // First entry for the group wins } } accessSectionInfo.permissions.put(p.getName(), pInfo); |