opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Rebase: Don't swallow caught exception

Change-Id: I9d4cd56d6b4a7e2ec612e4e401b77b8e1bf73b99
This commit is contained in:
David Pursehouse
2019-08-22 19:02:17 +09:00
parent fa4840be35 e4d1b55a1a
commit 5f78e60775
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/extensions/restapi/UnprocessableEntityException.java
View File

@@ -21,4 +21,8 @@ public class UnprocessableEntityException extends RestApiException {
public UnprocessableEntityException(String msg) { public UnprocessableEntityException(String msg) {
super(msg); super(msg);
} }
public UnprocessableEntityException(String msg, Throwable cause) {
super(msg, cause);
}
} }

2
java/com/google/gerrit/server/restapi/change/Rebase.java
View File

@@ -168,7 +168,7 @@ public class Rebase extends RetryingRestModifyView<RevisionResource, RebaseInput
} }
} catch (NoSuchChangeException e) { } catch (NoSuchChangeException e) {
throw new UnprocessableEntityException( throw new UnprocessableEntityException(
String.format("Base change not found: %s", input.base)); String.format("Base change not found: %s", input.base), e);
} }
PatchSet.Id baseId = base.patchSet().getId(); PatchSet.Id baseId = base.patchSet().getId();