opendev/gerrit
Code Issues Proposed changes

Merge commit '3f5e1c46c3245a29a7eb2dafd2609a7a67e4a781'

Browse Source 
* commit '3f5e1c46c3245a29a7eb2dafd2609a7a67e4a781':
  Fix change state in patch set approval if reviewer is added to closed change
This commit is contained in:
Shawn O. Pearce
2011-10-27 09:46:49 -07:00
parent 6e1b930ba2 3f5e1c46c3
commit 1eb7cbd04a
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/patch/AddReviewer.java
View File

@@ -198,7 +198,8 @@ public class AddReviewer implements Callable<ReviewerResult> {
if (!exists(psid, reviewer)) {
// This reviewer has not entered an approval for this change yet.
//
final PatchSetApproval myca = dummyApproval(psid, reviewer);
final PatchSetApproval myca =
dummyApproval(control.getChange(), psid, reviewer);
toInsert.add(myca);
added.add(reviewer);
}
@@ -235,10 +236,13 @@ public class AddReviewer implements Callable<ReviewerResult> {
.iterator().hasNext();
}
private PatchSetApproval dummyApproval(final PatchSet.Id patchSetId,
final Account.Id reviewerId) {
return new PatchSetApproval(new PatchSetApproval.Key(patchSetId,
reviewerId, addReviewerCategoryId), (short) 0);
private PatchSetApproval dummyApproval(final Change change,
final PatchSet.Id patchSetId, final Account.Id reviewerId) {
final PatchSetApproval dummyApproval =
new PatchSetApproval(new PatchSetApproval.Key(patchSetId, reviewerId,
addReviewerCategoryId), (short) 0);
dummyApproval.cache(change);
return dummyApproval;
}
public static boolean isLegalReviewerGroup(final AccountGroup.UUID groupUUID) {