opendev/gerrit
Code Issues Proposed changes

Merge "Submit: if change to be submitted is missing in index result check if it is merged"

Browse Source
This commit is contained in:
Edwin Kempin 2019-12-20 14:01:31 +00:00 committed by Gerrit Code Review
commit b40ae09b8d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/com/google/gerrit/server/submit/MergeOp.java
View File

@ -16,7 +16,6 @@ package com.google.gerrit.server.submit;
import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Comparator.comparing; import static java.util.Comparator.comparing;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toSet; import static java.util.stream.Collectors.toSet;
@ -459,11 +458,17 @@ public class MergeOp implements AutoCloseable {
try { try {
ChangeSet indexBackedChangeSet = ChangeSet indexBackedChangeSet =
mergeSuperSet.setMergeOpRepoManager(orm).completeChangeSet(change, caller); mergeSuperSet.setMergeOpRepoManager(orm).completeChangeSet(change, caller);
checkState( if (!indexBackedChangeSet.ids().contains(change.getId())) {
indexBackedChangeSet.ids().contains(change.getId()), // indexBackedChangeSet contains only open changes, if the change is missing in this set
"change %s missing from %s", // it might be that the change was concurrently submitted in the meantime.
change.getId(), change = changeDataFactory.create(change).reloadChange();
indexBackedChangeSet); if (!change.isNew()) {
throw new ResourceConflictException("change is " + ChangeUtil.status(change));
}
throw new IllegalStateException(
String.format("change %s missing from %s", change.getId(), indexBackedChangeSet));
}
if (indexBackedChangeSet.furtherHiddenChanges()) { if (indexBackedChangeSet.furtherHiddenChanges()) {
throw new AuthException( throw new AuthException(
"A change to be submitted with " + change.getId() + " is not visible"); "A change to be submitted with " + change.getId() + " is not visible");