opendev/gerrit
Code Issues Proposed changes

Merge "Fix NPE in CreateAccessChange"

Browse Source
This commit is contained in:
David Pursehouse
2018-04-10 13:10:58 +00:00
committed by Gerrit Code Review
parent 8c65c396ee 37c18c1891
commit b17ab9d99f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/server/restapi/project/CreateAccessChange.java
View File

@@ -119,6 +119,7 @@ public class CreateAccessChange implements RestModifyView<ProjectResource, Proje
try (MetaDataUpdate md = metaDataUpdateUser.create(rsrc.getNameKey())) { try (MetaDataUpdate md = metaDataUpdateUser.create(rsrc.getNameKey())) {
ProjectConfig config = ProjectConfig.read(md); ProjectConfig config = ProjectConfig.read(md);
ObjectId oldCommit = config.getRevision(); ObjectId oldCommit = config.getRevision();
String oldCommitSha1 = oldCommit == null ? null : oldCommit.getName();
setAccess.validateChanges(config, removals, additions); setAccess.validateChanges(config, removals, additions);
setAccess.applyChanges(config, removals, additions); setAccess.applyChanges(config, removals, additions);
@@ -141,7 +142,7 @@ public class CreateAccessChange implements RestModifyView<ProjectResource, Proje
config.commitToNewRef( config.commitToNewRef(
md, new PatchSet.Id(changeId, Change.INITIAL_PATCH_SET_ID).toRefName()); md, new PatchSet.Id(changeId, Change.INITIAL_PATCH_SET_ID).toRefName());
if (commit.name().equals(oldCommit.getName())) { if (commit.name().equals(oldCommitSha1)) {
throw new BadRequestException("no change"); throw new BadRequestException("no change");
} }