diff options
| author | Nasser Grainawi <nasser@codeaurora.org> | 2021-11-12 11:06:49 -0700 |
|---|---|---|
| committer | Nasser Grainawi <nasser@codeaurora.org> | 2021-11-12 11:06:49 -0700 |
| commit | 9e15f445e32dd0bea1241683be638954c0d658e3 (patch) | |
| tree | c569f29b66e051ecfb716146e76000ca257ecc3d | |
| parent | 0becefd2b81c1eea84851ec891abb8689937b8ee (diff) | |
| parent | 72d9721c4a5bde51f7247643af4f2d1b9111ab51 (diff) | |
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Change bouncycastle urls
ListAccess: Fix incorrect behavior when group appears twice for same rule
Change-Id: I211ecf8b1c2d2b1929dc69826f63b2b9792a6697
| -rw-r--r-- | java/com/google/gerrit/server/restapi/project/GetAccess.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/google/gerrit/server/restapi/project/GetAccess.java b/java/com/google/gerrit/server/restapi/project/GetAccess.java index 4ec187a68e..91c0e78f87 100644 --- a/java/com/google/gerrit/server/restapi/project/GetAccess.java +++ b/java/com/google/gerrit/server/restapi/project/GetAccess.java @@ -336,7 +336,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 loadGroup(groups, group); } } |