opendev/gerrit
Code Issues Proposed changes

PatchSetInserter: Propagate commit validation exceptions

Browse Source 
Propagate CommitValidationException as ResourceConflictException instead
of InvalidChangeOperation would render the original error on the the UI,
instead of raising internal server error message.

This was fixed in I95b88dc6f2, but was broken again in If267dcf123.

Bug: Issue 3442
Change-Id: I443a1f0937f0ee411a659d79944a0126cf615aea
This commit is contained in:
David Ostrovsky
2015-10-29 08:30:27 +01:00
committed by David Pursehouse
parent a3a53d446f
commit b03dd90524
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkState;
import com.google.common.collect.SetMultimap;
import com.google.gerrit.common.ChangeHooks;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.ChangeMessage;
@@ -194,7 +195,7 @@ public class PatchSetInserter extends BatchUpdate.Op {
@Override
public void updateRepo(RepoContext ctx)
throws InvalidChangeOperationException, IOException {
throws ResourceConflictException, IOException {
init();
validate(ctx);
patchSetInfo = patchSetInfoFactory.get(ctx.getRevWalk(), commit, psId);
@@ -300,7 +301,7 @@ public class PatchSetInserter extends BatchUpdate.Op {
}
private void validate(RepoContext ctx)
throws InvalidChangeOperationException, IOException {
throws ResourceConflictException, IOException {
CommitValidators cv = commitValidatorsFactory.create(
refControl, sshInfo, ctx.getRepository());
@@ -327,7 +328,7 @@ public class PatchSetInserter extends BatchUpdate.Op {
break;
}
} catch (CommitValidationException e) {
throw new InvalidChangeOperationException(e.getMessage());
throw new ResourceConflictException(e.getMessage());
}
}
}