opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Avoid NPE when listing groups of a user in Gerrit slave mode
  polygerrit: Add note in README about npm install

Change-Id: I3d5a4ecf1b3a7fcf9af36de95b11efa0d51cf265
This commit is contained in:
David Pursehouse
2018-01-31 08:27:23 +09:00
parent 6c5ecb9671 6d125cc913
commit b368a125cb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java
View File

@@ -204,7 +204,8 @@ public class GroupIncludeCacheImpl implements GroupIncludeCache {
@Override
public ImmutableList<AccountGroup.UUID> load(AccountGroup.UUID key) throws OrmException {
if (groupIndexProvider.get().getSchema().hasField(GroupField.SUBGROUP)) {
GroupIndex groupIndex = groupIndexProvider.get();
if (groupIndex != null && groupIndex.getSchema().hasField(GroupField.SUBGROUP)) {
return groupQueryProvider
.get()
.bySubgroup(key)

3
polygerrit-ui/README.md
View File

@@ -101,6 +101,9 @@ bazel build polygerrit &&
This step requires the `web-component-tester` npm module.
Note: it may be necessary to add the options `--unsafe-perm=true --allow-root`
to the `npm install` command to avoid file permission errors.
Run all web tests:
```sh