opendev/gerrit
Code Issues Proposed changes

Merge "Don't treat MergeIdenticalTreeException as internal server error"

Browse Source
This commit is contained in:
Alice Kober-Sotzek
2018-02-21 13:04:23 +00:00
committed by Gerrit Code Review
parent 593b1f2bf3 6522914663
commit ce3a03e34f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/git/MergeIdenticalTreeException.java
View File

@@ -14,13 +14,13 @@
package com.google.gerrit.server.git;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
/**
* Indicates that the commit is already contained in destination branch. Either the commit itself is
* in the source tree, or the content is merged
*/
public class MergeIdenticalTreeException extends RestApiException {
public class MergeIdenticalTreeException extends ResourceConflictException {
private static final long serialVersionUID = 1L;
/** @param msg message to return to the client describing the error. */