| commit | 72d9721c4a5bde51f7247643af4f2d1b9111ab51 | [log] [tgz] |
|---|---|---|
| author | Nasser Grainawi <nasser@codeaurora.org> | Fri Nov 12 10:21:26 2021 -0700 |
| committer | Nasser Grainawi <nasser@codeaurora.org> | Fri Nov 12 10:21:26 2021 -0700 |
| tree | 574a90f2e9942426fdb9b354af280dfb25624e7c | |
| parent | 0ed64ee206c940fccb628bdc10518cc5eb211217 [diff] | |
| parent | 22e0fd3db7bcaf4b8ddf000bd150efa513024134 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Change bouncycastle urls ListAccess: Fix incorrect behavior when group appears twice for same rule Change-Id: I7d06e0e9217cfd2ead3b6378d37c703f60c9042a
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 e8252b4..589d642 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 @@ } 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); } }