opendev/gerrit
Code Issues Proposed changes

ApprovalCopier: Add precondition checks in getForPatchSet(db, ctl, ps)

Browse Source 
The CheckIT.currentPatchSetMissing test is failing with NPE in
ApprovalCopier.getForPatchSet.

The precondition checks added here reveal that getForPatchSet is
being called with a null PatchSet.

Change-Id: I3f992327620aa4c39af64ea968e1e7dffddad2d7
This commit is contained in:
David Pursehouse
2015-10-22 18:11:03 +09:00
parent 39db6c73e6
commit 334f95d75e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.server; package com.google.gerrit.server;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.gerrit.server.change.ChangeKind.NO_CHANGE; import static com.google.gerrit.server.change.ChangeKind.NO_CHANGE;
import static com.google.gerrit.server.change.ChangeKind.NO_CODE_CHANGE; import static com.google.gerrit.server.change.ChangeKind.NO_CODE_CHANGE;
import static com.google.gerrit.server.change.ChangeKind.TRIVIAL_REBASE; import static com.google.gerrit.server.change.ChangeKind.TRIVIAL_REBASE;
@@ -91,11 +92,13 @@ public class ApprovalCopier {
private Iterable<PatchSetApproval> getForPatchSet(ReviewDb db, private Iterable<PatchSetApproval> getForPatchSet(ReviewDb db,
ChangeControl ctl, PatchSet ps) throws OrmException { ChangeControl ctl, PatchSet ps) throws OrmException {
checkNotNull(ps, "ps should not be null");
ChangeData cd = changeDataFactory.create(db, ctl); ChangeData cd = changeDataFactory.create(db, ctl);
try { try {
ProjectState project = ProjectState project =
projectCache.checkedGet(cd.change().getDest().getParentKey()); projectCache.checkedGet(cd.change().getDest().getParentKey());
ListMultimap<PatchSet.Id, PatchSetApproval> all = cd.approvals(); ListMultimap<PatchSet.Id, PatchSetApproval> all = cd.approvals();
checkNotNull(all, "all should not be null");
Table<String, Account.Id, PatchSetApproval> byUser = Table<String, Account.Id, PatchSetApproval> byUser =
HashBasedTable.create(); HashBasedTable.create();