opendev/gerrit
Code Issues Proposed changes

Fix redundant throws clause

Browse Source 
+ MergeConflictException is a subtype of ResourceConflictException

Change-Id: I88dda5f847f4ac353279ea3e1a248f23e43c64db
This commit is contained in:
Andrew Bonventre
2016-11-22 18:16:37 -05:00
parent 4a1769c62e
commit 3c998f21c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java
View File

@@ -238,9 +238,9 @@ public class RebaseChangeOp extends BatchUpdate.Op {
* @throws MergeConflictException the rebase failed due to a merge conflict.
* @throws IOException the merge failed for another reason.
*/
private RevCommit rebaseCommit(RepoContext ctx, RevCommit original,
ObjectId base, String commitMessage)
throws ResourceConflictException, MergeConflictException, IOException {
private RevCommit rebaseCommit(
RepoContext ctx, RevCommit original, ObjectId base, String commitMessage)
throws ResourceConflictException, IOException {
RevCommit parentCommit = original.getParent(0);
if (base.equals(parentCommit)) {