diff options
author | Nasser Grainawi <nasser@codeaurora.org> | 2021-11-12 10:21:26 -0700 |
---|---|---|
committer | Nasser Grainawi <nasser@codeaurora.org> | 2021-11-12 10:21:26 -0700 |
commit | 72d9721c4a5bde51f7247643af4f2d1b9111ab51 (patch) | |
tree | 574a90f2e9942426fdb9b354af280dfb25624e7c | |
parent | 0ed64ee206c940fccb628bdc10518cc5eb211217 (diff) | |
parent | 22e0fd3db7bcaf4b8ddf000bd150efa513024134 (diff) |
Merge branch 'stable-2.14' into stable-2.15upstream/stable-2.15
* stable-2.14:
Change bouncycastle urls
ListAccess: Fix incorrect behavior when group appears twice for same rule
Change-Id: I7d06e0e9217cfd2ead3b6378d37c703f60c9042a
-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 e8252b46ac..589d64216b 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 @@ -307,7 +307,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); } } |