diff options
| author | Nasser Grainawi <nasser@codeaurora.org> | 2021-11-11 15:22:50 -0700 |
|---|---|---|
| committer | Nasser Grainawi <nasser@codeaurora.org> | 2021-11-11 15:22:50 -0700 |
| commit | 22e0fd3db7bcaf4b8ddf000bd150efa513024134 (patch) | |
| tree | b65110378dba07df8665237c565994c80bfebe4a | |
| parent | 708d36e7ddae86525df3856fb8a3528d20ccd77b (diff) | |
| parent | 4e81b56abf0e75af66cc9fe45d6e0ed557d54bd8 (diff) | |
Merge branch 'stable-2.13' into stable-2.14upstream/stable-2.14
* stable-2.13:
Change bouncycastle urls
ListAccess: Fix incorrect behavior when group appears twice for same rule
Change-Id: I5c5f4522d4297e3b98f880bdbdad519cf5dfb187
| -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 79894559dd..1f1275cf57 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 @@ -245,7 +245,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); |