opendev/gerrit
Code Issues Proposed changes

Merge "Fix: SSH abandon or restore adds the cover message twice"

Browse Source
This commit is contained in:
Edwin Kempin 2012-12-13 05:12:56 -08:00 committed by Gerrit Code Review
commit fe7060bbc1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
View File

@ -195,9 +195,11 @@ public class ReviewCommand extends SshCommand {
private void applyReview(final ChangeControl ctl, final PatchSet.Id patchSetId,
final PostReview.Input review) throws Exception {
reviewProvider.get().apply(new RevisionResource(
new ChangeResource(ctl),
db.patchSets().get(patchSetId)), review);
if (!review.labels.isEmpty()) {
reviewProvider.get().apply(new RevisionResource(
new ChangeResource(ctl),
db.patchSets().get(patchSetId)), review);
}
}
private void approveOne(final PatchSet.Id patchSetId) throws Exception {
@ -218,6 +220,13 @@ public class ReviewCommand extends SshCommand {
}
}
// If review labels are being applied, the comment will be included
// on the review note. We don't need to add it again on the abandon
// or restore comment.
if (!review.labels.isEmpty()) {
changeComment = null;
}
try {
ChangeControl ctl =
changeControlFactory.controlFor(patchSetId.getParentKey());