opendev/gerrit
Code Issues Proposed changes

Submit: use equals instead of != on Account.Ids

Browse Source 
This was resulting in some SUBM records getting overwritten with
slightly-newer records in some cases.

Change-Id: I048a54acbb2f406d699cf5d6c92c872acda95930
This commit is contained in:
Dave Borowitz 2015-01-27 18:28:07 -08:00
parent c3ffacf5c3
commit 49d01b9b08
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,7 +419,8 @@ public class Submit implements RestModifyView<RevisionResource, SubmitInput>,
} }
PatchSetApproval submit = ApprovalsUtil.getSubmitter(psId, byKey.values()); PatchSetApproval submit = ApprovalsUtil.getSubmitter(psId, byKey.values());
if (submit == null || submit.getAccountId() != caller.getAccountId()) { if (submit == null
|| !submit.getAccountId().equals(caller.getAccountId())) {
submit = new PatchSetApproval( submit = new PatchSetApproval(
new PatchSetApproval.Key( new PatchSetApproval.Key(
rsrc.getPatchSet().getId(), rsrc.getPatchSet().getId(),