| commit | 7f3e3126ad0ad19d777a6ede8f0a9833d5045478 | [log] [tgz] |
|---|---|---|
| author | Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> | Fri Jul 03 11:02:44 2020 -0400 |
| committer | Nguyen Tuan Khang Phan <nguyen.tuan.khang.phan@ericsson.com> | Sat Jul 04 19:54:29 2020 +0000 |
| tree | ebf79bc6fb59ed9e21c89b3353f974902a62576e | |
| parent | bbfe8e5bb36d46ad1204b1d47a394a3896c9c10e [diff] |
GroupList: handle null pointer when name is null If PluginConfig.getGroup(GroupReference.extractGroupName(configValue)) [1] is called with configValue without "group" prefix, null will be passed in to GroupList.byName(name) [2] as name and null pointer will happen. Changing order of comparison will result in the same functionality and null pointer avoidance. [1] https://gerrit.googlesource.com/gerrit/+/refs/heads/master/java/com/google/gerrit/server/config/PluginConfig.java [2] https://gerrit.googlesource.com/gerrit/+/refs/heads/master/java/com/google/gerrit/server/project/GroupList.java Change-Id: I0545d7786d71041342651d6bc2ceec96b6fcfd1c
diff --git a/java/com/google/gerrit/server/project/GroupList.java b/java/com/google/gerrit/server/project/GroupList.java index 7237bb6..9b65413 100644 --- a/java/com/google/gerrit/server/project/GroupList.java +++ b/java/com/google/gerrit/server/project/GroupList.java
@@ -74,7 +74,7 @@ public GroupReference byName(String name) { return byUUID.entrySet().stream() .map(Map.Entry::getValue) - .filter(groupReference -> name.equals(groupReference.getName())) + .filter(groupReference -> groupReference.getName().equals(name)) .findAny() .orElse(null); }