opendev/gerrit
Code Issues Proposed changes

Merge "Move out the merge change step out of Submit#apply"

Browse Source
This commit is contained in:
ekempin
2017-05-05 07:22:05 +00:00
committed by Gerrit Code Review
parent 44478c039c 1b29800432
commit fd41b33148
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,6 +209,11 @@ public class Submit
submitter = rsrc.getUser().asIdentifiedUser(); submitter = rsrc.getUser().asIdentifiedUser();
} }
return new Output(mergeChange(rsrc, submitter, input));
}
public Change mergeChange(RevisionResource rsrc, IdentifiedUser submitter, SubmitInput input)
throws OrmException, RestApiException, IOException {
Change change = rsrc.getChange(); Change change = rsrc.getChange();
if (!change.getStatus().isOpen()) { if (!change.getStatus().isOpen()) {
throw new ResourceConflictException("change is " + ChangeUtil.status(change)); throw new ResourceConflictException("change is " + ChangeUtil.status(change));
@@ -235,7 +240,7 @@ public class Submit
switch (change.getStatus()) { switch (change.getStatus()) {
case MERGED: case MERGED:
return new Output(change); return change;
case NEW: case NEW:
ChangeMessage msg = getConflictMessage(rsrc); ChangeMessage msg = getConflictMessage(rsrc);
if (msg != null) { if (msg != null) {